人员、科室字典、其他绩效添加是否通过验证及排序

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -1819,6 +1819,21 @@
             比率
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.AllotId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.Type">
+            <summary>
+            1 返回accounting列表 2 返回核算单元类型 3 返回核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.UnitType">
+            <summary>
+            核算单元类型、核算组别
+            </summary>
+        </member>
         <member name="T:Performance.DtoModels.AgainAllotRequest">
             <summary>
             二次分配请求

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -4306,6 +4306,11 @@
             是否在抽取数据0 否、1 是、2 抽取成功、3 抽取失败
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_allot.ExtractTime">
+            <summary>
+            数据抽取起始时间
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.per_allot.Generate">
             <summary>
             1、人事科提交重新生成 2、生成成功 3、原始数据修改

performance/Performance.DtoModels/Response/DeptdicResponse.cs

@@ -18,11 +18,16 @@ public class DeptdicResponse
         public Deptdic LogisticsAccounting { get; set; }
         public Deptdic SpecialAccounting { get; set; }
         public DateTime? CreateTime { get; set; }
+        public int FailedVerifyCount { get; set; }
     }
 
     public class Deptdic
     {
         public int Id { get; set; }
         public string AccountingUnit { get; set; }
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public Nullable<int> IsVerify { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -85,5 +85,10 @@ public class per_apr_amount
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public Nullable<int> IsVerify { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_dept_dic.cs

@@ -50,7 +50,12 @@ public class per_dept_dic
         /// 医院Id
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public Nullable<int> IsVerify { get; set; }
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -120,7 +120,12 @@ public class per_employee
         /// 备注
         /// </summary>
         public string Remark { get; set; }
-    
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public Nullable<int> IsVerify { get; set; }
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.Services/EmployeeService.cs

@@ -396,10 +396,8 @@ public List<per_apr_amount> GetAprList(int allotId, int userId)
                 list = perapramountRepository.GetEntities(t => t.AllotId == allotId && (t.Amount ?? 0) != 0);
             else
                 list = perapramountRepository.GetEntities(t => t.AllotId == allotId && (t.Amount ?? 0) != 0 && t.CreateUser == userId);
-            if (list != null && list.Any())
-                list = list.OrderBy(t => t.DoctorName).ToList();
 
-            return list;
+            return list?.OrderBy(t => t.IsVerify ?? 0).ThenBy(t => t.DoctorName).ToList();
         }
 
         public List<per_apr_amount> GetAprList(int allotId, string department)

performance/Performance.Services/PersonService.cs

@@ -175,7 +175,7 @@ public List<per_employee> GetPersons(int allotId, int userId)
 
             var list = peremployeeRepository.GetEntities(exp);
             if (list != null && list.Any())
-                return list.OrderBy(t => t.Id).ToList();
+                return list.OrderBy(t => t.IsVerify ?? 0).ThenBy(t => t.Id).ToList();
 
             return new List<per_employee>();
         }
@@ -317,10 +317,11 @@ public IEnumerable<DeptdicResponse> GetDepartments(int hospitalId)
                 InpatTechnicAccounting = GetDeptdic(t.FirstOrDefault(group => group.Department == t.Key.Department && group.HISDeptName == t.Key.HISDeptName && group.UnitType == UnitType.医技组.ToString() && group.Source == "住院")),
                 LogisticsAccounting = GetDeptdic(t.FirstOrDefault(group => group.Department == t.Key.Department && group.HISDeptName == t.Key.HISDeptName && group.UnitType == UnitType.行政后勤.ToString())),
                 SpecialAccounting = GetDeptdic(t.FirstOrDefault(group => group.Department == t.Key.Department && group.HISDeptName == t.Key.HISDeptName && group.UnitType == UnitType.特殊核算组.ToString())),
-                CreateTime = t.Max(group => group.CreateTime)
+                CreateTime = t.Max(group => group.CreateTime),
+                FailedVerifyCount = t.Count(group => group.IsVerify == 0)
             });
 
-            return result.OrderByDescending(t => t.CreateTime).ThenBy(t => t.Department);
+            return result.OrderByDescending(t => t.FailedVerifyCount).ThenByDescending(t => t.CreateTime).ThenBy(t => t.Department);
         }
 
         private (string dept, string[] unittype) GetDeptByUser(int userId)
@@ -356,7 +357,8 @@ private Deptdic GetDeptdic(per_dept_dic dic)
             return new Deptdic
             {
                 Id = dic.Id,
-                AccountingUnit = dic.AccountingUnit
+                AccountingUnit = dic.AccountingUnit,
+                IsVerify = dic.IsVerify ?? 0
             };
         }