Merge branch 'hotfix/抽取bug修复'

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_wujiang;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -3539,6 +3539,11 @@
             0 不显示 1 显示
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.SecondListResponse.IsShowManageButton">
+            <summary>
+            行政后勤是否显示管理绩效按钮 1 是 2 否
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SecondPerforResponse.Efficiency">
             <summary>
             效率绩效

performance/Performance.Services/ExtractExcelService/ExtractDtos/ExtractTransDto.cs

@@ -68,5 +68,10 @@ public class ExtractTransDto
         /// 核算单元（住院医技）
         /// </summary>
         public string InpatTechnicAccounting { get; set; }
+
+        /// <summary>
+        /// 特殊核算组
+        /// </summary>
+        public string SpecialAccounting { get; set; }
     }
 }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -271,6 +271,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                         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,
                     };
                 });
 
@@ -286,6 +287,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                 InpatDoctorAccounting = t.First().InpatDoctorAccounting,
                 InpatNurseAccounting = t.First().InpatNurseAccounting,
                 InpatTechnicAccounting = t.First().InpatTechnicAccounting,
+                SpecialAccounting = t.First().SpecialAccounting
             });
 
             return groupdata.ToList();

performance/Performance.Services/ExtractExcelService/SheetDataWrite/AccountBasicDataWrite.cs

@@ -46,7 +46,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
 
                     var tuples = GetAccountingUnitDataNonexistent(sheet, point, accountingUnits);
 
-                    accountingUnits = accountingUnits.Where(t => !t.AccountingUnit.Contains("非核算"))?.ToList();
+                    accountingUnits = accountingUnits.Where(t => !t.AccountingUnit.Contains("非核算") && !t.AccountingUnit.Contains("0") && !string.IsNullOrEmpty(t.AccountingUnit))?.ToList();
 
                     if (accountingUnits != null && accountingUnits.Any())
                         WriteAccountingUnitDataNonexistent(sheet, point, style, accountingUnits, tuples);

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

@@ -45,7 +45,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
                 var index = columns.IndexOf(SpecialUnitColumns.Department);
                 var needMergedRegions = mergedRegions.Where(t => t.FirstColumn == index && t.LastColumn == index)?.ToList() ?? new List<SpecialCellRange>();
 
-                var specials = exSpecials.GroupJoin(extractDto, outer => new { outer.Department, outer.Target }, inner => new { Department = inner.InpatDoctorAccounting, Target = inner.Category },
+                var specials = exSpecials.GroupJoin(extractDto, outer => new { outer.Department, outer.Target }, inner => new { Department = inner.Department, Target = inner.Category },
                     (outer, inner) => new SpecialDto
                     {
                         Department = outer.Department,