1.空白科室、费用类型默认为"（空白）"

2.4.1及之后不进行科室补充

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -238,6 +238,12 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
         {
             if (results == null || !results.Any()) return new List<ExtractTransDto>();
 
+            results.ForEach(t =>
+            {
+                t.Category = string.IsNullOrEmpty(t.Category) ? "（空白）" : t.Category;
+                t.Department = string.IsNullOrEmpty(t.Department) ? "（空白）" : t.Department;
+            });
+
             var dict = personService.GetDepartments(hospitalId)?.ToList();
             if (dict == null || !dict.Any())
                 return results.GroupBy(t => new { t.Department, t.Category, t.Source }).Select(t => new ExtractTransDto

performance/Performance.Services/ExtractExcelService/WriteDataFactory.cs

@@ -36,9 +36,9 @@ public ISheetDataWrite GetWriteData(SheetType sheetType, ILogger logger)
                     factory = new WorkloadDataWrite(logger);
                     break;
 
-                case SheetType.AccountBasic:
-                    factory = new AccountBasicDataWrite(logger);
-                    break;
+                //case SheetType.AccountBasic:
+                //    factory = new AccountBasicDataWrite(logger);
+                //    break;
 
                 case SheetType.SpecialUnit:
                     factory = new SpecialUnitDataWrite(logger);
@@ -52,18 +52,18 @@ public ISheetDataWrite GetWriteData(SheetType sheetType, ILogger logger)
                 //    factory = new DepartmentDataWrite(logger);
                 //    break;
 
-                case SheetType.AccountExtra:
-                case SheetType.AccountDrugAssess:
-                case SheetType.AccountMaterialsAssess:
-                case SheetType.AccountScoreAverage:
-                case SheetType.BudgetRatio:
-                case SheetType.AssessBeforeOtherFee:
-                case SheetType.AccountAdjustLaterOtherFee:
-                case SheetType.WorkloadMedicineProp:
-                case SheetType.WorkloadCMI:
-                case SheetType.WorkloadIncline:
-                    factory = new AccountExtraDataWrite(logger);
-                    break;
+                //case SheetType.AccountExtra:
+                //case SheetType.AccountDrugAssess:
+                //case SheetType.AccountMaterialsAssess:
+                //case SheetType.AccountScoreAverage:
+                //case SheetType.BudgetRatio:
+                //case SheetType.AssessBeforeOtherFee:
+                //case SheetType.AccountAdjustLaterOtherFee:
+                //case SheetType.WorkloadMedicineProp:
+                //case SheetType.WorkloadCMI:
+                //case SheetType.WorkloadIncline:
+                //    factory = new AccountExtraDataWrite(logger);
+                //    break;
 
                 default:
                     return null;