合并梧州版

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -3719,6 +3719,11 @@
             语句执行完成所需时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_script.IsOrgDepartment">
+            <summary>
+            是否使用原始科室 1 是 2 否
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ex_special">
             <summary>
             

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -59,5 +59,10 @@ public class ex_script
         /// 语句执行完成所需时间
         /// </summary>
         public decimal TimeConsuming { get; set; } = 0;
+
+        /// <summary>
+        /// 是否使用原始科室 1 是 2 否
+        /// </summary>
+        public int IsOrgDepartment { get; set; }
     }
 }

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

@@ -234,7 +234,11 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
                     var row = sheet.GetOrCreate(dataFirstRowNum);
                     for (int cellIndex = point.HeaderFirstCellNum.Value; cellIndex < columnHeader.LastCellNum; cellIndex++)
                     {
-                        var column = columnHeader.GetCell(cellIndex).GetDecodeEscapes()?.Replace("(", "（").Replace(")", "）");
+                        var column = columnHeader.GetCell(cellIndex).GetDecodeEscapes();
+                        List<string> uts = new List<string> { "核算单元(医技组)", "核算单元(医生组)", "核算单元(护理组)" };
+                        if (uts.Contains(column)) 
+                            column = column?.Replace("(", "（").Replace(")", "）");
+
                         var cell = row.CreateCell(cellIndex);
 
                         if (filed.ContainsKey(column))

performance/Performance.Services/ExtractExcelService/ExtractJobService.cs

@@ -79,10 +79,11 @@ public void Execute()
                     if (allot == null || allot.ID == 0) continue;
 
                     var dict = new Dictionary<ExDataDict, object>();
+                    var scripts = new List<ex_script>();
 
                     var isSingle = hospital.IsSingleProject == 1;
                     dictionaryService.Handler(hospital.ID, allot, "", isSingle);
-                    var data = queryService.Handler(hospital.ID, allot, "", isSingle, ref dict);
+                    var data = queryService.Handler(hospital.ID, allot, "", isSingle, ref dict, ref scripts);
                 }
                 catch (Exception ex)
                 {

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -97,6 +97,7 @@ public string Main(int allotId, int hospitalId, string email, string groupName,
 
                 allot = allots.First(t => t.ID == allotId);
                 var dict = new Dictionary<ExDataDict, object>();
+                var scripts = new List<ex_script>();
 
                 logService.ReturnTheLog(allotId, groupName, 3, "", 5, 1, isSingle);
 
@@ -106,8 +107,9 @@ public string Main(int allotId, int hospitalId, string email, string groupName,
                 employeeService.SyncDataToResult(allotId);
 
                 var data = exresultRepository.GetEntities(t => t.AllotId == allotId);
-                data.AddRange(queryService.Handler(hospitalId, allot, groupName, isSingle, ref dict));
-                var standData = StandDataFormat(hospitalId, allotId, data);
+
+                data.AddRange(queryService.Handler(hospitalId, allot, groupName, isSingle, ref dict, ref scripts));
+                var standData = StandDataFormat(hospitalId, allotId, scripts, data);
 
                 dictionaryService.Handler(hospitalId, allot, groupName, isSingle);
 
@@ -279,7 +281,7 @@ private object GetDataBySheetType(int hospitalId, SheetType sheetType, List<Extr
         /// <param name="hospitalId"></param>
         /// <param name="results"></param>
         /// <returns></returns>
-        private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<ex_result> results)
+        private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<ex_script> scripts, List<ex_result> results)
         {
             if (results == null || !results.Any()) return new List<ExtractTransDto>();
 
@@ -306,51 +308,53 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<
 
             dict.ForEach(t =>
             {
-                t.HISDeptName = WriteDataHelper.HasValue(t.HISDeptName, t.Department);
+                t.Department = WriteDataHelper.HasValue(t.Department, t.HISDeptName);
             });
-            var data = new List<ExtractTransDto>();
-            foreach (var item in results)
+
+            var data = results
+                .GroupJoin(dict, outer => new { Department = outer.Department }, inner => new { Department = inner.HISDeptName }, (outer, inner) => new { outer, inner })
+                .Select(t =>
                 {
-                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;
+                    if (scripts.Any(w => w.TypeId == t.outer.TypeId && w.IsOrgDepartment == 1))
+                        dept = t.outer.Department;
+
+                    return new ExtractTransDto
                     {
-                    SheetName = item.Source,
+                        SheetName = t.outer.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,
+                        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,
                     };
-                data.Add(d);
-            }
+                });
 
-            var groupdata = data.GroupBy(t => new { t.Department, t.Category, t.SheetName })
-                .Select(t => new ExtractTransDto
+            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,
+                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
             });
 
-            return groupdata.ToList();
+            return groupdata.Where(w => w.Value.HasValue && w.Value != 0).ToList();
         }
 
         private void UpdateAllot(IDbConnection connection, per_allot allot)

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -75,7 +75,7 @@ public void ClearConnectionPools()
         /// <param name="hospitalId"></param>
         /// <param name="allot"></param>
         /// <returns></returns>
-        public List<ex_result> Handler(int hospitalId, per_allot allot, string groupName, bool isSingle, ref Dictionary<ExDataDict, object> dict)
+        public List<ex_result> Handler(int hospitalId, per_allot allot, string groupName, bool isSingle, ref Dictionary<ExDataDict, object> dict, ref List<ex_script> scripts)
         {
             try
             {
@@ -94,7 +94,7 @@ public List<ex_result> Handler(int hospitalId, per_allot allot, string groupName
 
                 logService.ReturnTheLog(allot.ID, groupName, 2, "提取数据", $"开始提取数据", isSingle: isSingle);
 
-                var scripts = exscriptRepository.GetEntities(t => extypeIds.Contains(t.TypeId));
+                scripts = exscriptRepository.GetEntities(t => extypeIds.Contains(t.TypeId));
                 if (scripts != null && scripts.Any())
                 {
                     var allmodules = dict[ExDataDict.ExModule] as List<ex_module>;