修改unittype名称

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

@@ -1227,12 +1227,14 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,Performance.DtoModels.PersonParamsRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,System.String,System.String,Performance.DtoModels.PersonParamsRequest)">
             <summary>
             手工录入列表 - 明细
             </summary>
             <param name="allotId"></param>
-            <param name="request"></param>
+            <param name="department">科室</param>
+            <param name="source">来源</param>
+            <param name="request">分页</param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(System.Int32,Performance.DtoModels.PersonParamsRequest)">
@@ -1240,7 +1242,7 @@
             手工录入列表 - 汇总 
             </summary>
             <param name="allotId"></param>
-            <param name="request"></param>
+            <param name="request">分页</param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">

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

@@ -3574,11 +3574,6 @@
             创建时间
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ex_result.IsDelete">
-            <summary>
-            1 删除 0 未删除
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.ex_result_gather.Id">
             <summary>
             
@@ -3629,11 +3624,6 @@
             备注
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ex_result_gather.States">
-            <summary>
-            1 未通过 2 通过 
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.ex_script">
             <summary>
             

performance/Performance.Services/ComputeService.cs

@@ -280,7 +280,7 @@ public List<DeptResponse> GetMedicalPerformance(int allotId)
         {
             return GetGroupPerformance(allotId, new List<int> { (int)UnitType.医技组 });
         }
-        
+
 
         /// <summary>
         /// 返回医生组科室绩效
@@ -2006,7 +2006,7 @@ private decimal GetDecimal(decimal? value, decimal _ = 0)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public List<cof_alias> CustomColumnHeaders(int hospitalId, string route,params string[] heads)
+        public List<cof_alias> CustomColumnHeaders(int hospitalId, string route, params string[] heads)
         {
             var init = new List<cof_alias>();
             var alias = cofaliasRepository.GetEntities(t => t.HospitalId == hospitalId) ?? new List<cof_alias>();
@@ -2086,12 +2086,12 @@ public List<dynamic> GetAllComputeViewByDate(string viewName, DateTime beginTime
         {
             return reportRepository.QueryComputeByDate(viewName, beginTime, endTime);
         }
-        public (int count, List<dynamic> data) GetAllComputeViewByDateAndTotal(string viewName, DateTime beginTime, DateTime endTime,List<string> groupBy,List<string> sumBy,int pageNumber = 0,int pageSize = 0)
+        public (int count, List<dynamic> data) GetAllComputeViewByDateAndTotal(string viewName, DateTime beginTime, DateTime endTime, List<string> groupBy, List<string> sumBy, int pageNumber = 0, int pageSize = 0)
         {
-            return reportRepository.QueryComputeByDateAndTotal(viewName, beginTime, endTime,groupBy,sumBy,pageNumber,pageSize);
+            return reportRepository.QueryComputeByDateAndTotal(viewName, beginTime, endTime, groupBy, sumBy, pageNumber, pageSize);
         }
 
-        public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary request,string ViewName)
+        public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary request, string ViewName)
         {
             DateTime bdate = DateTime.Now;
             DateTime edate = DateTime.Now;
@@ -2101,7 +2101,7 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
 
             decimal TotalData = 0;
 
-            var(TotalCount, datas) = GetAllComputeViewByDateAndTotal(ViewName, bdate, edate.AddMonths(1), request.GroupBy, request.SumBy, request.CurrentPage, request.PageSize);
+            var (TotalCount, datas) = GetAllComputeViewByDateAndTotal(ViewName, bdate, edate.AddMonths(1), request.GroupBy, request.SumBy, request.CurrentPage, request.PageSize);
             if (null == datas)
                 throw new PerformanceException("当前绩效记录不存在");
 
@@ -2164,7 +2164,7 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
 
     public class ComputeConfig
     {
-        public static List<cof_alias> PerformanceTotal(string route,string[] heads)
+        public static List<cof_alias> PerformanceTotal(string route, string[] heads)
         {
             if (heads == null || heads.Length == 0 || (heads.Length > 0 && heads[0] == ""))
             {
@@ -2175,7 +2175,7 @@ public static List<cof_alias> PerformanceTotal(string route,string[] heads)
                 if (route == "/report/wholehospital_finance_grant_summary")
                     return AllComputePersonView.ToList();
             }
-            if (route== "/report/wholehospital_grant_summary")
+            if (route == "/report/wholehospital_grant_summary")
                 return AllComputeView.Where(t => heads.Contains(t.Name.ToLower())).ToList();
             if (route == "/report/wholehospital_accounting_grant_summary")
                 return AllComputeDepartmentView.Where(t => heads.Contains(t.Name.ToLower())).ToList();
@@ -2186,7 +2186,7 @@ public static List<cof_alias> PerformanceTotal(string route,string[] heads)
         public static List<cof_alias> AllComputeView { get; } = new List<cof_alias>
         {
             new cof_alias{ Alias = "来源", Name = nameof(view_allot_sign_emp.Source), States = 1, SumStatus = 0},
-            new cof_alias{ Alias = "科室类别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0},
 
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0},
@@ -2224,13 +2224,13 @@ public static List<cof_alias> AllComputeViewByDate
             }
         }
 
-        
+
 
 
 
         public static List<cof_alias> AllComputePersonView { get; } = new List<cof_alias>
         {
-            new cof_alias{ Alias = "科室类别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "人员姓名", Name = nameof(view_allot_sign_emp.EmployeeName), States = 1, SumStatus = 0},
@@ -2261,7 +2261,7 @@ public static List<cof_alias> AllComputePersonViewByDate
         }
         public static List<cof_alias> AllComputeDepartmentView { get; } = new List<cof_alias>
         {
-            new cof_alias{ Alias = "核算群体", Name = nameof(view_allot_sign_dept.UnitType), States = 1, SumStatus = 0},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_dept.UnitType), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_dept.AccountingUnit), States = 1, SumStatus = 0},
             new cof_alias{ Alias = "业绩绩效", Name = nameof(view_allot_sign_dept.PerforFee), States = 1, SumStatus = 1},
             new cof_alias{ Alias = "工作量绩效", Name = nameof(view_allot_sign_dept.WorkloadFee), States = 1, SumStatus = 1},