科室字典显示问题

performance/Performance.DtoModels/Response/DeptdicResponse.cs

@@ -9,14 +9,14 @@ public class DeptdicResponse
         public int HospitalId { get; set; }
         public string HISDeptName { get; set; }
         public string Department { get; set; }
-        public string OutDoctorAccounting { get; set; }
-        public string OutNurseAccounting { get; set; }
-        public string OutTechnicAccounting { get; set; }
-        public string InpatDoctorAccounting { get; set; }
-        public string InpatNurseAccounting { get; set; }
-        public string InpatTechnicAccounting { get; set; }
-        public string LogisticsAccounting { get; set; }
-        public string SpecialAccounting { get; set; }
+        public Deptdic OutDoctorAccounting { get; set; }
+        public Deptdic OutNurseAccounting { get; set; }
+        public Deptdic OutTechnicAccounting { get; set; }
+        public Deptdic InpatDoctorAccounting { get; set; }
+        public Deptdic InpatNurseAccounting { get; set; }
+        public Deptdic InpatTechnicAccounting { get; set; }
+        public Deptdic LogisticsAccounting { get; set; }
+        public Deptdic SpecialAccounting { get; set; }
         public DateTime? CreateTime { get; set; }
         public int IsVerify { get; set; }
     }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -320,13 +320,13 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                         DoctorName = t.outer.DoctorName,
                         PersonnelNumber = t.outer.PersonnelNumber,
                         Value = t.outer.Fee ?? 0,
-                        OutDoctorAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutDoctorAccounting,
-                        OutNurseAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutNurseAccounting,
-                        OutTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.OutTechnicAccounting,
-                        InpatDoctorAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatDoctorAccounting,
-                        InpatNurseAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatNurseAccounting,
-                        InpatTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatTechnicAccounting,
-                        SpecialAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.SpecialAccounting ?? dept,
+                        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,
                     };
                 });

performance/Performance.Services/PersonService.cs

@@ -426,18 +426,13 @@ public IEnumerable<DeptdicResponse> GetDepartments(int hospitalId)
             var depts = perdeptdicRepository.GetEntities(t => t.HospitalId == hospitalId);
             if (depts == null || !depts.Any()) return null;
 
-            string GetDeptdic(List<per_dept_dic> dics, string department, string hISDeptName, UnitType unitType, string source = "")
+            Deptdic GetDeptdic(List<per_dept_dic> dics, string department, string hISDeptName, UnitType unitType, string source = "")
             {
-                if (hISDeptName == "介入室")
-                {
-
-                }
                 var dic = dics.FirstOrDefault(group => group.Department == department && group.HISDeptName == hISDeptName && group.UnitType == unitType.ToString() && group.Source == source);
-
                 if (dic == null)
                     dic = dics.FirstOrDefault(group => group.Department == department && group.HISDeptName == hISDeptName && group.UnitType == unitType.ToString());
-
-                return dic?.AccountingUnit;
+                if (dic == null) return new Deptdic() { IsVerify = 1 };
+                return new Deptdic { Id = dic.Id, AccountingUnit = dic.AccountingUnit, IsVerify = dic.IsVerify ?? 1, VerifyMessage = dic.VerifyMessage, };
             }
 
             var result = depts