合并冲突

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

@@ -322,18 +322,17 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<
                     DoctorName = item.DoctorName,
                     PersonnelNumber = item.PersonnelNumber,
                     Value = item.Fee ?? 0,
-                    OutDoctorAccounting = firstDic?.OutDoctorAccounting,
-                    OutNurseAccounting = firstDic?.OutNurseAccounting,
-                    OutTechnicAccounting = firstDic?.OutTechnicAccounting,
-                    InpatDoctorAccounting = firstDic?.InpatDoctorAccounting,
-                    InpatNurseAccounting = firstDic?.InpatNurseAccounting,
-                    InpatTechnicAccounting = firstDic?.InpatTechnicAccounting,
-                    SpecialAccounting = firstDic?.SpecialAccounting ?? dept,
+                    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
                 {

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