提取优化

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -309,44 +309,47 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<
                 t.HISDeptName = WriteDataHelper.HasValue(t.HISDeptName, t.Department);
             });
 
-            var data = results.GroupJoin(dict, outer => new { Department = outer.Department }, inner => new { Department = inner.HISDeptName }, (outer, inner) => new { outer, inner })
-                .Select(t =>
+            var data = new List<ExtractTransDto>();
+            foreach (var item in results)
+            {
+                var firstDic = dict.FirstOrDefault(w => w.HISDeptName == item.Department) ?? dict.FirstOrDefault(w => w.Department == item.Department);
+                var dept = !string.IsNullOrEmpty(firstDic?.Department) ? firstDic?.Department : item.Department;
+                var d = new ExtractTransDto
                 {
-                    var dept = !string.IsNullOrEmpty(t.inner.FirstOrDefault()?.Department) ? t.inner.FirstOrDefault()?.Department : t.outer.Department;
-                    return new ExtractTransDto
-                    {
-                        SheetName = t.outer.Source,
-                        Department = dept,
-                        Category = t.outer.Category,
-                        DoctorName = t.outer.DoctorName,
-                        PersonnelNumber = t.outer.PersonnelNumber,
-                        Value = t.outer.Fee ?? 0,
-                        OutDoctorAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutDoctorAccounting?.AccountingUnit,
-                        OutNurseAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutNurseAccounting?.AccountingUnit,
-                        OutTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutTechnicAccounting?.AccountingUnit,
-                        InpatDoctorAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatDoctorAccounting?.AccountingUnit,
-                        InpatNurseAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatNurseAccounting?.AccountingUnit,
-                        InpatTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatTechnicAccounting?.AccountingUnit,
-                        SpecialAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.SpecialAccounting?.AccountingUnit ?? dept,
-                        EName = types.FirstOrDefault(w => w.Id == t.outer.TypeId)?.EName,
-                    };
-                });
+                    SheetName = item.Source,
+                    Department = dept,
+                    Category = item.Category,
+                    DoctorName = item.DoctorName,
+                    PersonnelNumber = item.PersonnelNumber,
+                    Value = item.Fee ?? 0,
+                    OutDoctorAccounting = firstDic?.OutDoctorAccounting?.AccountingUnit,
+                    OutNurseAccounting = firstDic?.OutNurseAccounting?.AccountingUnit,
+                    OutTechnicAccounting = firstDic?.OutTechnicAccounting?.AccountingUnit,
+                    InpatDoctorAccounting = firstDic?.InpatDoctorAccounting?.AccountingUnit,
+                    InpatNurseAccounting = firstDic?.InpatNurseAccounting?.AccountingUnit,
+                    InpatTechnicAccounting = firstDic?.InpatTechnicAccounting?.AccountingUnit,
+                    SpecialAccounting = firstDic?.SpecialAccounting?.AccountingUnit ?? dept,
+                    EName = types.FirstOrDefault(w => w.Id == item.TypeId)?.EName,
+                };
+                data.Add(d);
+            }
 
-            var groupdata = data.GroupBy(t => new { t.Department, t.Category, t.SheetName }).Select(t => new ExtractTransDto
-            {
-                SheetName = t.Key.SheetName,
-                Department = t.Key.Department,
-                Category = t.Key.Category,
-                Value = t.Sum(group => group.Value) == 0 ? null : t.Sum(group => group.Value),
-                OutDoctorAccounting = t.FirstOrDefault()?.OutDoctorAccounting,
-                OutNurseAccounting = t.FirstOrDefault()?.OutNurseAccounting,
-                OutTechnicAccounting = t.FirstOrDefault()?.OutTechnicAccounting,
-                InpatDoctorAccounting = t.FirstOrDefault()?.InpatDoctorAccounting,
-                InpatNurseAccounting = t.FirstOrDefault()?.InpatNurseAccounting,
-                InpatTechnicAccounting = t.FirstOrDefault()?.InpatTechnicAccounting,
-                SpecialAccounting = t.FirstOrDefault()?.SpecialAccounting,
-                EName = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.EName))?.EName
-            });
+            var groupdata = data.GroupBy(t => new { t.Department, t.Category, t.SheetName })
+                .Select(t => new ExtractTransDto
+                {
+                    SheetName = t.Key.SheetName,
+                    Department = t.Key.Department,
+                    Category = t.Key.Category,
+                    Value = t.Sum(group => group.Value) == 0 ? null : t.Sum(group => group.Value),
+                    OutDoctorAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.OutDoctorAccounting))?.OutDoctorAccounting,
+                    OutNurseAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.OutNurseAccounting))?.OutNurseAccounting,
+                    OutTechnicAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.OutTechnicAccounting))?.OutTechnicAccounting,
+                    InpatDoctorAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.InpatDoctorAccounting))?.InpatDoctorAccounting,
+                    InpatNurseAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.InpatNurseAccounting))?.InpatNurseAccounting,
+                    InpatTechnicAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.InpatTechnicAccounting))?.InpatTechnicAccounting,
+                    SpecialAccounting = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.SpecialAccounting))?.SpecialAccounting,
+                    EName = t.FirstOrDefault(w => !string.IsNullOrEmpty(w.EName))?.EName
+                });
 
             return groupdata.ToList();
         }