Merge remote-tracking branch 'origin/v2020morge-graphql' into v2020morge-graphql

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -139,7 +139,7 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
             logger.LogInformation($"allotId: {allot.ID}: 总金额 - {extractDto?.Sum(s => s.Value ?? 0)}");
 
             WriteDataFactory factory = new WriteDataFactory();
-            var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload, SheetType.OtherWorkload, SheetType.AccountBasic };
+            var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload, SheetType.OtherWorkload/*, SheetType.AccountBasic*/ };
             decimal ratio = 60m;
             for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
             {
@@ -242,7 +242,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                         InpatTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatTechnicAccounting?.AccountingUnit,
                     };
                 });
-            logger.LogInformation("************抽取结果1***************: " + JsonHelper.Serialize(data.Where(t => t.Department == "一病区（外科一）" && t.Category == "CT费")));
+
             var groupdata = data.GroupBy(t => new { t.Department, t.Category, t.SheetName }).Select(t => new ExtractTransDto
             {
                 SheetName = t.Key.SheetName,
@@ -256,7 +256,6 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                 InpatNurseAccounting = t.First().InpatNurseAccounting,
                 InpatTechnicAccounting = t.First().InpatTechnicAccounting,
             });
-            logger.LogInformation("************抽取结果2***************: " + JsonHelper.Serialize(groupdata.Where(t => t.Department == "一病区（外科一）" && t.Category == "CT费")));
 
             return groupdata.ToList();
         }