Merge branch 'feature/检查核算单元' into develop

performance/Performance.Api/Controllers/AllotController.cs

@@ -301,7 +301,28 @@ public ApiResponse GenerateReport([CustomizeValidator(RuleSet = "Delete"), FromB
                     await Task.Delay(TimeSpan.FromSeconds(5), token);
                 }
             });
-            return new ApiResponse(ResponseType.OK);
+            return new ApiResponse(ResponseType.OK, "统计报表数据任务开始");
+        }
+
+        /// <summary>
+        /// 验证科室核算单元、工号
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("accounting/verify/{allotId}")]
+        [HttpPost]
+        public ApiResponse AccountingVerify([FromRoute] int allotId)
+        {
+            _backgroundTaskQueue.QueueBackgroundWorkItem(async token =>
+            {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    var scopedServices = scope.ServiceProvider.GetRequiredService<AllotService>();
+                    scopedServices.AccoungtingVerify(allotId);
+                    await Task.Delay(TimeSpan.FromSeconds(5), token);
+                }
+            });
+            return new ApiResponse(ResponseType.OK, "核算单元及组别数据验证任务开始");
         }
 
         /*

performance/Performance.Api/Controllers/ConfigController.cs

@@ -594,19 +594,6 @@ public ApiResponse AccountingDelete([FromRoute] int accountingId)
                 return new ApiResponse(ResponseType.Fail);
             return new ApiResponse(ResponseType.OK);
         }
-
-        /// <summary>
-        /// 核算单元及组别数据验证
-        /// </summary>
-        /// <param name="allotId"></param>
-        /// <returns></returns>
-        [Route("accountingverify/{allotId}")]
-        [HttpPost]
-        public ApiResponse AccountingVerify([FromRoute] int allotId)
-        {
-            _configService.AccoungtingVerify(allotId);
-            return new ApiResponse(ResponseType.OK);
-        }
         #endregion
 
         /// <summary>

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

@@ -239,6 +239,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.AccountingVerify(System.Int32)">
+            <summary>
+            验证科室核算单元、工号
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Recalculation(Performance.DtoModels.RecalculationRequest)">
             <summary>
             重新计算院领导绩效
@@ -294,6 +301,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.DownloadCurrentCalculationTable(Performance.DtoModels.AllotRequest)">
+            <summary>
+            下载当前测算表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
             <summary>
             预算管理查询（包含金额、占比）

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

@@ -1149,6 +1149,11 @@
             岗位系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.GiveFee">
+            <summary>
+            考核后绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.UnitType">
             <summary>
             核算单元分类

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,12 +18,15 @@ 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; }
     }
 
     public class DeptdicHands

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

@@ -7,58 +7,68 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 科室字典表
     /// </summary>
     [Table("per_dept_dic")]
-	public class per_dept_dic
+    public class per_dept_dic
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// his系统科室名称
         /// </summary>
         public string HISDeptName { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 核算单元类型
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 来源住院/门诊
         /// </summary>
         public string Source { get; set; }
-    
+
         /// <summary>
         /// 医院Id
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<DateTime> CreateTime { get; set; }
-    
+
         /// <summary>
         /// 
         /// </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

@@ -120,7 +120,7 @@ public class per_employee
         /// 备注
         /// </summary>
         public string Remark { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
@@ -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.Repository/PerforCofdirectorRepository.cs

@@ -219,11 +219,5 @@ union all
                 return flag;
             }
         }
-
-
-        public int VerifyAccountingAndUnittype(int allotId)
-        {
-            return Execute("call proc_verify_accoungingunit_unittype(@allotId);", new { allotId });
-        }
     }
 }

performance/Performance.Services/AllotService.cs

@@ -440,6 +440,8 @@ public void Generate(per_allot allot)
 
                 UpdateAllotStates(allot.ID, (int)AllotStates.GenerateAccomplish, EnumHelper.GetDescription(AllotStates.GenerateAccomplish), generate);
                 perforCofdirectorRepository.SupplementaryData(allot.ID);
+                // 验证科室核算单元、工号
+                AccoungtingVerify(allot.ID);
 
                 //logManageService.WriteMsg("正在生成报表数据", "正在生成报表数据", 1, allot.ID, "ReceiveMessage", true);
                 //var res = reportService.ImportData(allot);
@@ -474,6 +476,15 @@ public void GenerateReport(per_allot allot)
         }
 
         /// <summary>
+        /// 验证科室核算单元、工号
+        /// </summary>
+        /// <param name="allot"></param>
+        public void AccoungtingVerify(int allotId)
+        {
+            reportService.ExecProc("call proc_verify_accoungingunit_unittype(@allotId);", new { allotId });
+        }
+
+        /// <summary>
         /// 重新计算院领导绩效
         /// </summary>
         /// <param name="allotId"></param>

performance/Performance.Services/ConfigService.cs

@@ -706,17 +706,6 @@ public bool AccountingDelete(int accountingId)
             return cofaccountingRepository.Remove(entity);
         }
 
-
-        /// <summary>
-        /// 删除数据
-        /// </summary>
-        /// <param name="accountingId"></param>
-        /// <returns></returns>
-        public void AccoungtingVerify(int allotId)
-        {
-            _directorRepository.VerifyAccountingAndUnittype(allotId);
-        }
-
         #endregion
 
         #region Copy

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

@@ -176,7 +176,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>();
         }
@@ -318,10 +318,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)
@@ -357,7 +358,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,
             };
         }