抽取数据时带出新建SHEET页和数据信息

performance/Performance.Services/DFExtractService.cs

@@ -805,6 +805,7 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
             }
 
             int sheetIndex = 0;
+            int newSheetCount = 0;
             foreach (var module in modulesList.Where(t => t.SheetType == (int)SheetType.Income)?.OrderBy(t => t.ModuleName))
             {
                 var sheet = workbook.GetSheet(module.ModuleName);
@@ -822,7 +823,7 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
                         logger.LogInformation($"newSheet: {newSheet.SheetName}");
                         workbook.SetSheetOrder(newSheet.SheetName, sheetIndex);
                         workbook.SetSheetName(sheetIndex, module.ModuleName);
-                        sheetIndex++;
+                        sheetIndex++; newSheetCount++;
                     }
                 }
             }
@@ -839,7 +840,7 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
                     {
                         var item = pairs.Where(t => t.Key.StartsWith("3.")).OrderByDescending(t => t.Key).First();
                         if (sheetIndex == 0)
-                            sheetIndex = item.Value + 1;
+                            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}");

performance/Performance.Services/ExConfigService.cs

@@ -504,7 +504,7 @@ public List<TitleValue> ExtractScheme(int hospitalId, List<int> executeType)
         public List<TitleValue> FeeType()
         {
             var titlevalue = new List<TitleValue>();
-            var type = EnumHelper.GetItems<SheetType>().Where(t => new List<int> { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.SpecialUnit }.Contains(t.Value));
+            var type = EnumHelper.GetItems<SheetType>().Where(t => new List<int> { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.SpecialUnit, (int)SheetType.OtherWorkload }.Contains(t.Value));
             if (type != null && type.Any())
             {
                 titlevalue = type.Select(t => new TitleValue

performance/Performance.Services/LogManageService.cs

@@ -83,7 +83,7 @@ public void ReturnTheLog(int allotId, string groupName, int type, string tag, ob
                 var http = url.ImportFile + $"/template/returnlog?type={type}&tag={tag}&message={message}&level={level}&groupName={groupName}";
                 //logger.LogInformation("发送日志：" + http);
                 logdbug.Add(allotId, tag, message.ToString(), level, type);
-                //HttpHelper.HttpPost(http);
+                HttpHelper.HttpPost(http);
             }
             catch (Exception ex)
             {