特殊科室微调

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

@@ -57,9 +57,8 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                         if (sheetIndex == 0)
                             sheetIndex = item.Value + 1;
                         var copysheet = workbook.GetSheet(item.Key);
-                        var newSheet = copysheet.CopySheet(item.Key + Guid.NewGuid().ToString("N"), true);
+                        var newSheet = copysheet.CopySheet(module.ModuleName, true);
                         workbook.SetSheetOrder(newSheet.SheetName, sheetIndex);
-                        workbook.SetSheetName(sheetIndex, module.ModuleName);
                         sheetIndex++; newSheetCount++;
                     }
                 }
@@ -78,9 +77,8 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                         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);
+                        var newSheet = copysheet.CopySheet(module.ModuleName, true);
                         workbook.SetSheetOrder(newSheet.SheetName, sheetIndex);
-                        workbook.SetSheetName(sheetIndex, module.ModuleName);
                         sheetIndex++;
                     }
                 }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -75,7 +75,6 @@ public string Main(int allotId, int hospitalId, string email, string groupName =
                 var standData = StandDataFormat(hospitalId, data);
 
                 var statesArray = new int[] { (int)AllotStates.GenerateSucceed, (int)AllotStates.Archive };
-                //var lastAllot = allots.Where(t => statesArray.Contains(t.States))?.OrderByDescending(t => t.Year).ThenByDescending(t => t.Month).FirstOrDefault();
 
                 var templateFilePath = ExtractHelper.GetExtractFile(hospitalId, ref extractFilePath, filePath);
 

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

@@ -28,30 +28,28 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
                 var exSpecials = exdict[ExDataDict.ExSpecial] as List<ex_special>;
                 if (exSpecials == null || !exSpecials.Any()) return;
 
-                if (data is List<ExtractTransDto> extractDto && extractDto.Any())
-                {
-                    var mergedRegions = new List<SpecialCellRange>();
-                    RemoveMergedRegion(sheet, ref mergedRegions);
-                    SupplyMergedRegionData(sheet, style, mergedRegions);
-
-                    var index = columns.IndexOf(SpecialUnitColumns.Department);
-                    var needMergedRegions = mergedRegions.Where(t => t.FirstColumn == index && t.LastColumn == index)?.ToList();
-
-                    var specials = exSpecials.GroupJoin(extractDto, outer => new { outer.Department, outer.Target }, inner => new { inner.Department, Target = inner.Category },
-                        (outer, inner) => new SpecialDto
-                        {
-                            Department = outer.Department,
-                            Target = outer.Target,
-                            TargetFactor = outer.TargetFactor,
-                            AdjustFactor = outer.AdjustFactor,
-                            Quantity = inner.FirstOrDefault()?.Value
-                        }).ToList();
-
-                    SupplySpecialQuantity(sheet, style, specials, columns, ref dataFirstRowNum);
-                    AddNewSpecialConfig(sheet, style, specials, needMergedRegions, columns, dataFirstRowNum);
-                    AddMergedRegion(sheet, needMergedRegions, columns);
-                }
+                var extractDto = (data as List<ExtractTransDto>) ?? new List<ExtractTransDto>();
+
+                var mergedRegions = new List<SpecialCellRange>();
+                RemoveMergedRegion(sheet, ref mergedRegions);
+                SupplyMergedRegionData(sheet, style, mergedRegions);
 
+                var index = columns.IndexOf(SpecialUnitColumns.Department);
+                var needMergedRegions = mergedRegions.Where(t => t.FirstColumn == index && t.LastColumn == index)?.ToList();
+
+                var specials = exSpecials.GroupJoin(extractDto, outer => new { outer.Department, outer.Target }, inner => new { inner.Department, Target = inner.Category },
+                    (outer, inner) => new SpecialDto
+                    {
+                        Department = outer.Department,
+                        Target = outer.Target,
+                        TargetFactor = outer.TargetFactor,
+                        AdjustFactor = outer.AdjustFactor,
+                        Quantity = inner.FirstOrDefault()?.Value
+                    }).ToList();
+
+                SupplySpecialQuantity(sheet, style, specials, columns, ref dataFirstRowNum);
+                AddNewSpecialConfig(sheet, style, specials, needMergedRegions, columns, dataFirstRowNum);
+                AddMergedRegion(sheet, needMergedRegions, columns);
             }
             catch (Exception ex)
             {
@@ -276,16 +274,13 @@ private void SetCellValue(ICell cell, CellType cellType, string value)
                 case CellType.String:
                     cell.SetCellValue(value.ToString());
                     break;
-                case CellType.Formula:
-                    cell.SetCellType(CellType.String);
-                    cell.SetCellValue(value.ToString());
-                    break;
                 case CellType.Boolean:
                     cell.SetCellValue(ConvertHelper.To<int>(value));
                     break;
                 case CellType.Unknown:
                 case CellType.Blank:
                 case CellType.Error:
+                case CellType.Formula:
                 default:
                     break;
             }