其他工作量抽取修改

performance/Performance.Services/DFExtractService.cs

@@ -520,10 +520,14 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
                         WriteExpend(sheet, sheetRead, modules, items, extracts, false);
                         break;
                     case SheetType.Workload:
-                    case SheetType.OtherWorkload:
                         ClearData(sheet, 3, 3);
                         WriteWorkload(sheet, sheetRead, modules, items, extracts, false);
                         break;
+                    case SheetType.OtherWorkload:
+                        ClearData(sheet, 1, 3, true);
+                        sheetRead = PerSheetDataFactory.GetDataRead(SheetType.Workload);
+                        WriteWorkload(sheet, sheetRead, modules, items, extracts);
+                        break;
                     //case SheetType.AccountBasic:
                     //    WriteAccountBasic(sheet, sheetRead, false);
                     //    break;
@@ -838,19 +842,19 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
                 if (sheet == null)
                 {
                     logger.LogInformation($"CreateNotExistSheet: {module.ModuleName}");
-                    string key = "工作量";
-                    if (module.ModuleName.Contains(key))
-                    {
-                        var item = pairs.Where(t => t.Key.StartsWith("3.")).OrderByDescending(t => t.Key).First();
-                        if (sheetIndex == 0)
-                            sheetIndex = item.Value + newSheetCount + 1;
-                        var copysheet = workbook.GetSheet(item.Key);
-                        var newSheet = copysheet.CopySheet(item.Key + Guid.NewGuid().ToString("N"), true);
-                        logger.LogInformation($"newSheet: {newSheet.SheetName}");
-                        workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
-                        workbook.SetSheetName(workbook.NumberOfSheets - 1, module.ModuleName);
-                        sheetIndex++;
-                    }
+                    //string key = "工作量";
+                    //if (module.ModuleName.Contains(key))
+                    //{
+                    var item = pairs.Where(t => t.Key.StartsWith("3.")).OrderByDescending(t => t.Key).First();
+                    if (sheetIndex == 0)
+                        sheetIndex = item.Value + newSheetCount + 1;
+                    var copysheet = workbook.GetSheet(item.Key);
+                    var newSheet = copysheet.CopySheet(item.Key + Guid.NewGuid().ToString("N"), true);
+                    logger.LogInformation($"newSheet: {newSheet.SheetName}");
+                    workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
+                    workbook.SetSheetName(workbook.NumberOfSheets - 1, module.ModuleName);
+                    sheetIndex++;
+                    //}
                 }
             }
         }

performance/Performance.Services/PerExcelService/PerSheetService.cs

@@ -90,8 +90,10 @@ public SheetType GetSheetType(string sheetName)
                 return SheetType.Income;
             else if (sheetName.StartsWith("2."))
                 return SheetType.Expend;
-            else if (sheetName.StartsWith("3."))
+            else if (sheetName.StartsWith("3.1") || sheetName.StartsWith("3.2"))
                 return SheetType.Workload;
+            else if (sheetName.StartsWith("3."))
+                return SheetType.OtherWorkload;
             else if (sheetName.StartsWith("4.1"))
                 return SheetType.AccountBasic;
             else if (sheetName.StartsWith("4.2"))