抽取修改

performance/Performance.Api/Controllers/TemplateController.cs

@@ -185,11 +185,11 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
                 if (!string.IsNullOrEmpty(message))
                     return new ApiResponse(ResponseType.Fail, message);
 
-                if (!string.IsNullOrEmpty(filePath))
-                {
-                    var data = configService.CheckHasNewDepartmentOrCategory(request.AllotId);
-                    return new ApiResponse(ResponseType.Fail, message);
-                }
+                //if (!string.IsNullOrEmpty(filePath))
+                //{
+                //    var data = configService.CheckHasNewDepartmentOrCategory(request.AllotId);
+                //    return new ApiResponse(ResponseType.Fail, data);
+                //}
 
                 //检验科室、费用类型是否需要补充
 

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

@@ -808,6 +808,9 @@
         <member name="F:Performance.DtoModels.SheetType.WorkloadIncline">
             <summary> 工作量倾斜系数 </summary>
         </member>
+        <member name="F:Performance.DtoModels.SheetType.Assess">
+            <summary> 考核 </summary>
+        </member>
         <member name="T:Performance.DtoModels.AccountUnitType">
             <summary>
             核算单元类型

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -11,32 +11,41 @@ public enum ExcelVersion
         xls
     }
 
-
     /// <summary> 核算单元类型 </summary>
     public enum UnitType
     {
         [Description("医生组")]
         医生组 = 1,
+
         [Description("护理组")]
         护理组 = 2,
+
         [Description("医技组")]
         医技组 = 3,
+
         [Description("专家组")]
         专家组 = 4,
+
         //[Description("其他")]
         //其他 = 5,
         [Description("特殊核算组")]
         特殊核算组 = 6,
+
         [Description("其他医生组")]
         其他医生组 = 7,
+
         [Description("其他护理组")]
         其他护理组 = 8,
+
         [Description("其他医技组")]
         其他医技组 = 9,
+
         [Description("行政高层")]
         行政高层 = 10,
+
         [Description("行政中层")]
         行政中层 = 11,
+
         [Description("行政后勤")]
         行政后勤 = 12,
     }
@@ -46,27 +55,35 @@ public enum SheetType
         /// <summary> 无法识别 </summary>
         [Description("无法识别")]
         Unidentifiable = 1,
+
         /// <summary> 行政中高层 </summary>
         [Description("行政中高层")]
         Employee = 2,
+
         /// <summary> 收入 </summary>
         [Description("收入")]
         Income = 3,
+
         /// <summary> 其他收入 </summary>
         [Description("其他收入")]
         OtherIncome = 4,
+
         /// <summary> 支出 </summary>
         [Description("支出")]
         Expend = 5,
+
         /// <summary> 加班 </summary>
         [Description("加班")]
         Overtime = 6,
+
         /// <summary> 工作量 </summary>
         [Description("工作量")]
         Workload = 7,
+
         /// <summary> 特殊核算单元 </summary>
         [Description("特殊核算单元")]
         SpecialUnit = 8,
+
         /// <summary> 临床科室医护绩效测算基础 </summary>
         [Description("临床科室医护绩效测算基础")]
         AccountBasic = 9,
@@ -74,15 +91,19 @@ public enum SheetType
         /// <summary> 科室经济核算汇总表 </summary>
         [Description("科室经济核算汇总表")]
         ComputeEconomic = 10,
+
         /// <summary> 医生工作量计算 </summary>
         [Description("医生工作量计算")]
         ComputeDoctorWorkload = 11,
+
         /// <summary> 护士工作量计算 </summary>
         [Description("护士工作量计算")]
         ComputeNurseWorkload = 12,
+
         /// <summary> 临床科室医生绩效测算表 </summary>
         [Description("临床科室医生绩效测算表")]
         ComputeDoctorAccount = 13,
+
         /// <summary> 临床科室护士绩效测算表 </summary>
         [Description("临床科室护士绩效测算表")]
         ComputeNurseAccount = 14,
@@ -115,7 +136,6 @@ public enum SheetType
         [Description("行政后勤")]
         LogisticsEmployee = 21,
 
-
         /// <summary> 科室考核 </summary>
         [Description("科室考核")]
         AccountScoreAverage = 25,
@@ -132,33 +152,41 @@ public enum SheetType
         [Description("其他工作量")]
         OtherWorkload = 28,
 
-
         /// <summary> 预算比例 </summary>
         [Description("预算比例")]
         BudgetRatio = 30,
+
         /// <summary> 科室考核前其他绩效 </summary>
         [Description("科室考核前其他绩效")]
         AssessBeforeOtherFee = 31,
+
         /// <summary> 其他管理绩效 </summary>
         [Description("其他管理绩效")]
         PersonOtherManagePerforFee = 32,
+
         /// <summary> 调节后其他管理绩效 </summary>
         [Description("调节后其他管理绩效")]
         PersonAdjustLaterOtherManagePerforFee = 33,
+
         /// <summary> 个人岗位系数 </summary>
         [Description("个人岗位系数")]
         PersonPostCoefficient = 34,
 
-
         /// <summary> 药占比系数 </summary>
         [Description("药占比系数")]
         WorkloadMedicineProp = 35,
+
         /// <summary> CMI系数 </summary>
         [Description("CMI系数")]
         WorkloadCMI = 36,
+
         /// <summary> 工作量倾斜系数 </summary>
         [Description("工作量倾斜系数")]
         WorkloadIncline = 37,
+
+        /// <summary> 考核 </summary>
+        [Description("考核")]
+        Assess = 38,    //该参数作用类似于 其他工作量
     }
 
     /// <summary>
@@ -169,18 +197,23 @@ public enum AccountUnitType
         /// <summary>  </summary>
         [Description("")]
         Null = 1,
+
         /// <summary> 临床科室 </summary>
         [Description("科主任")]
         科主任 = 2,
+
         /// <summary> 临床科室 </summary>
         [Description("护士长")]
         护士长 = 3,
+
         /// <summary> 行政高层 </summary>
         [Description("行政高层")]
         行政高层 = 4,
+
         /// <summary> 临床科室 </summary>
         [Description("行政中层")]
         行政中层 = 5,
+
         /// <summary> 临床科室 </summary>
         [Description("行政工勤")]
         行政工勤 = 6,
@@ -190,30 +223,43 @@ public enum PerforType
     {
         [Description("临床科室主任人均绩效")]
         临床主任,
+
         [Description("临床科室副主任人均绩效")]
         临床副主任,
+
         [Description("医技科室主任人均绩效")]
         医技主任,
+
         [Description("医技科室副主任人均绩效")]
         医技副主任,
+
         [Description("护士长人均绩效")]
         护士长,
+
         [Description("护士人均绩效")]
         护士,
+
         [Description("临床主任护士长平均")]
         临床主任护士长平均,
+
         [Description("临床主任医技主任护士长平均")]
         临床主任医技主任护士长平均,
+
         [Description("临床医生人均绩效")]
         临床医生,
+
         [Description("医技医生人均绩效")]
         医技医生,
+
         [Description("行政高层人均绩效")]
         行政高层,
+
         [Description("行政中层人均绩效")]
         行政中层,
+
         [Description("行政工勤人均绩效")]
         行政工勤,
+
         [Description("医生护士平均绩效")]
         医生护士平均,
     }
@@ -225,12 +271,16 @@ public enum MinimumType
     {
         [Description("保底绩效临床医生人均绩效")]
         保底临床医生 = 1,
+
         [Description("保底绩效医技医生人均绩效")]
         保底医技医生 = 2,
+
         [Description("保底绩效护士人均绩效")]
         保底护士 = 3,
+
         [Description("保底绩效行政工勤人均绩效")]
         保底工勤 = 4,
+
         [Description("自定义保底绩效")]
         自定义保底 = 5,
     }

performance/Performance.Services/ExConfigService.cs

@@ -672,8 +672,8 @@ public string Judge(int allotId, int hospitalId, int useTemplate, ref bool isSin
             var hospitalconfigs = hospitalconfigRepository.GetEntities(t => modDics.Select(s => s.ConfigId).Distinct().Contains(t.Id));
             if (hospitalconfigs == null || !hospitalconfigs.Any()) return null;
 
-            var sheets = persheetRepository.GetEntities(t => t.AllotID == prevAllot.ID && t.SheetType == (int)SheetType.Income);
-            var importdata = imdataRepository.GetEntities(t => sheets.Select(s => s.ID).Contains(t.SheetID.Value));
+            var sheets = persheetRepository.GetEntities(t => t.AllotID == prevAllot.ID && t.SheetType == (int)SheetType.Income) ?? new List<per_sheet>();
+            var importdata = imdataRepository.GetEntities(t => sheets.Select(s => s.ID).Contains(t.SheetID.Value)) ?? new List<im_data>();
 
             Dictionary<string, object> paramtemers = new Dictionary<string, object>();
             foreach (var dic in modDics)

performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs

@@ -68,7 +68,7 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                 }
             }
 
-            foreach (var module in modulesList.Where(t => new int[] { (int)SheetType.OtherWorkload, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess }
+            foreach (var module in modulesList.Where(t => new int[] { (int)SheetType.OtherWorkload, (int)SheetType.Assess }
             .Contains(t.SheetType.Value))?.OrderBy(t => t.ModuleName))
             {
                 var sheet = workbook.GetSheet(module.ModuleName) ?? workbook.GetSheet(module.ModuleName.NoBlank());
@@ -142,8 +142,10 @@ public static void ClearSheetTemplate(ISheet sheet, PerSheetPoint point, SheetTy
 
             if (!new SheetType[] { SheetType.Workload, SheetType.OtherWorkload }.Contains(sheetType))
             {
-                var row = sheet.GetRow(point.DataFirstRowNum.Value - 1);
+                var row = sheet.GetRow(0);
                 if (row != null) sheet.RemoveRow(row);
+
+                sheet.ShiftRows(point.DataFirstRowNum.Value, sheet.LastRowNum + 1, -1);
             }
         }