检查未通过排序最前

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

@@ -4396,6 +4396,16 @@
             备注
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_apr_amount.IsVerify">
+            <summary>
+            0 未通过验证 1 通过验证
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_apr_amount.VerifyMessage">
+            <summary>
+            验证失败描述
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.per_budget_amount">
             <summary>
             预算管理金额
@@ -4856,6 +4866,16 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_dept_dic.IsVerify">
+            <summary>
+            0 未通过验证 1 通过验证
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_dept_dic.VerifyMessage">
+            <summary>
+            验证失败描述
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.per_employee">
             <summary>
             绩效人员表
@@ -4976,6 +4996,16 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_employee.IsVerify">
+            <summary>
+            0 未通过验证 1 通过验证
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_employee.VerifyMessage">
+            <summary>
+            验证失败描述
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.per_first">
             <summary>
             首次上传文件地址（当医院存在标准库时，首次上传用户提交固定格式的excel，开发人员配置SQL脚本）

performance/Performance.DtoModels/Response/DeptdicResponse.cs

@@ -18,11 +18,14 @@ public class DeptdicResponse
         public Deptdic LogisticsAccounting { get; set; }
         public Deptdic SpecialAccounting { get; set; }
         public DateTime? CreateTime { get; set; }
+        public int IsVerify { get; set; }
     }
 
     public class Deptdic
     {
         public int Id { get; set; }
         public string AccountingUnit { get; set; }
+        public int IsVerify { get; set; }
+        public string VerifyMessage { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -85,5 +85,15 @@ public class per_apr_amount
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public int? IsVerify { get; set; }
+
+        /// <summary>
+        /// 验证失败描述
+        /// </summary>
+        public string VerifyMessage { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_dept_dic.cs

@@ -60,5 +60,15 @@ public class per_dept_dic
         /// 
         /// </summary>
         public Nullable<int> CreateUser { get; set; }
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public int? IsVerify { get; set; }
+
+        /// <summary>
+        /// 验证失败描述
+        /// </summary>
+        public string VerifyMessage { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -130,5 +130,15 @@ public class per_employee
         /// 
         /// </summary>
         public Nullable<int> CreateUser { get; set; }
+
+        /// <summary>
+        /// 0 未通过验证 1 通过验证
+        /// </summary>
+        public int? IsVerify { get; set; }
+
+        /// <summary>
+        /// 验证失败描述
+        /// </summary>
+        public string VerifyMessage { get; set; }
     }
 }

performance/Performance.Services/EmployeeService.cs

@@ -397,7 +397,7 @@ public List<per_apr_amount> GetAprList(int allotId, int userId)
             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();
+                list = list.OrderBy(w => w.IsVerify).ThenBy(t => t.DoctorName).ToList();
 
             return list;
         }

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(w => w.IsVerify).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),
+                IsVerify = t.Min(w => w.IsVerify) ?? 1,
             });
 
-            return result.OrderByDescending(t => t.CreateTime).ThenBy(t => t.Department);
+            return result.OrderBy(w => w.IsVerify).ThenByDescending(t => t.CreateTime).ThenBy(t => t.Department);
         }
 
         private (string dept, string[] unittype) GetDeptByUser(int userId)
@@ -356,7 +357,9 @@ private Deptdic GetDeptdic(per_dept_dic dic)
             return new Deptdic
             {
                 Id = dic.Id,
-                AccountingUnit = dic.AccountingUnit
+                AccountingUnit = dic.AccountingUnit,
+                IsVerify = dic.IsVerify ?? 1,
+                VerifyMessage = dic.VerifyMessage,
             };
         }