工作量写入

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

@@ -141,7 +141,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
             var filed = sheet.SheetName.Contains("住院") ? fieldInpat : fieldOut;
             if (sheet.SheetName.Contains("工作量"))
             {
-
+                filed = sheet.SheetName.Contains("医生") ? fieldDoctor : fieldNurse;
             }
 
             foreach (string department in departments)
@@ -169,22 +169,46 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
             }
         }
 
-        private readonly Dictionary<string, Func<dynamic, object>> fieldInpat = new Dictionary<string, Func<dynamic, object>>
+        /// <summary> 住院核算单元 </summary>
+        private readonly Dictionary<string, Func<ExtractTransDto, string>> fieldInpat = new Dictionary<string, Func<ExtractTransDto, string>>
         {
-            { "科室名称", (t) => t.Department },
-            { "核算单元（医生组）", (t) => t.InpatDoctorAccounting },
-            { "核算单元（护理组）", (t) => t.InpatNurseAccounting },
-            { "核算单元（医技组）", (t) => t.InpatTechnicAccounting },
+            { "科室名称", (dto) => dto.Department },
+            { "核算单元（医生组）", (dto) => new string []{ dto.InpatDoctorAccounting, dto.OutDoctorAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
+            { "核算单元（护理组）", (dto) => new string []{ dto.InpatNurseAccounting, dto.OutNurseAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
+            { "核算单元（医技组）", (dto) => new string []{ dto.InpatTechnicAccounting, dto.OutTechnicAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
         };
 
-        private readonly Dictionary<string, Func<dynamic, object>> fieldOut = new Dictionary<string, Func<dynamic, object>>
+        /// <summary> 门诊核算单元 </summary>
+        private readonly Dictionary<string, Func<ExtractTransDto, string>> fieldOut = new Dictionary<string, Func<ExtractTransDto, string>>
         {
-            { "科室名称", (t) => t.Department },
-            { "核算单元（医生组）", (t) => t.OutDoctorAccounting },
-            { "核算单元（护理组）", (t) => t.OutNurseAccounting },
-            { "核算单元（医技组）", (t) => t.OutTechnicAccounting },
+            { "科室名称", (dto) => dto.Department },
+            { "核算单元（医生组）", (dto) => new string []{ dto.OutDoctorAccounting, dto.InpatDoctorAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
+            { "核算单元（护理组）", (dto) => new string []{ dto.OutNurseAccounting, dto.InpatNurseAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
+            { "核算单元（医技组）", (dto) => new string []{ dto.OutTechnicAccounting, dto.InpatTechnicAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
         };
 
+        /// <summary> 医生工作量 </summary>
+        private readonly Dictionary<string, Func<ExtractTransDto, string>> fieldDoctor = new Dictionary<string, Func<ExtractTransDto, string>>
+        {
+            { "科室名称", (dto) => dto.Department },
+            { "核算单元", (dto) =>
+                          {
+                              var obj = new string []{ dto.OutDoctorAccounting, dto.InpatDoctorAccounting, dto.OutTechnicAccounting, dto.InpatTechnicAccounting }
+                                .FirstOrDefault(t => !string.IsNullOrEmpty(t));
+                              return obj;
+                          }
+            },
+        };
+
+        /// <summary> 护理工作量 </summary>
+        private readonly Dictionary<string, Func<ExtractTransDto, string>> fieldNurse = new Dictionary<string, Func<ExtractTransDto, string>>
+        {
+            { "科室名称", (dto) => dto.Department },
+            { "核算单元", (dto) => new string []{ dto.OutNurseAccounting, dto.InpatNurseAccounting }.FirstOrDefault(t => !string.IsNullOrEmpty(t)) },
+        };
+
+
+
         public string HasValue(params string[] list)
         {
             if (list == null || !list.Any()) return null;