写入数据时，科室为空时，继续写入数据

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

@@ -105,7 +105,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
                 dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
             }
 
-            if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
+            if (data == null || !data.Any()) return;
 
             WriteSheetDataNonexistent(sheet, columnHeader, point, sheetType, style, headers, data, dataFirstRowNum);
         }
@@ -171,7 +171,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
         private static void WriteSheetDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
             List<string> headers, List<ExtractTransDto> data, int dataFirstRowNum)
         {
-            var departments = data.Select(s => s.Department).Where(w => !string.IsNullOrEmpty(w)).Distinct().ToList();
+            var departments = data.Select(s => s.Department ?? "")/*.Where(w => !string.IsNullOrEmpty(w))*/.Distinct().ToList();
 
             var filed = sheet.SheetName.Contains("住院") ? fieldInpat : fieldOut;
             if (sheet.SheetName.Contains("工作量"))
@@ -186,7 +186,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
 
             foreach (string department in departments)
             {
-                var deptData = data.Where(t => t.Department == department);
+                var deptData = data.Where(t => (t.Department ?? "") == department);
                 if (deptData == null || !deptData.Any()) continue;
 
                 var row = sheet.GetOrCreate(dataFirstRowNum);
@@ -327,7 +327,7 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
                 dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
             }
 
-            if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
+            if (data == null || !data.Any()) return;
 
             WriteCollectDataNonexistent(sheet, columnHeader, point, sheetType, style, headers, data, dataFirstRowNum);
         }
@@ -393,7 +393,7 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
         private static void WriteCollectDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
             List<string> headers, List<collect_data> data, int dataFirstRowNum)
         {
-            var departments = data.Select(s => s.Department).Where(w => !string.IsNullOrEmpty(w)).Distinct().ToList();
+            var departments = data.Select(s => s.Department ?? "")/*.Where(w => !string.IsNullOrEmpty(w))*/.Distinct().ToList();
 
             var filed = new SheetType[] { SheetType.Workload, SheetType.OtherWorkload }.Contains(sheetType)
                 ? collectWork
@@ -406,7 +406,7 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
 
             foreach (string department in departments)
             {
-                var deptData = data.Where(t => t.Department == department);
+                var deptData = data.Where(t => (t.Department ?? "") == department);
                 if (deptData == null || !deptData.Any()) continue;
 
                 var row = sheet.GetOrCreate(dataFirstRowNum);