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

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

@@ -36,6 +36,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
                 if (exSpecials == null || !exSpecials.Any()) return;
 
                 var extractDto = (data as List<ExtractTransDto>) ?? new List<ExtractTransDto>();
+                logger.LogInformation("特殊科室数据1：" + JsonHelper.Serialize(extractDto));
 
                 var mergedRegions = new List<SpecialCellRange>();
                 RemoveMergedRegion(sheet, ref mergedRegions);
@@ -44,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 { inner.Department, Target = inner.Category },
+                var specials = exSpecials.GroupJoin(extractDto, outer => new { outer.Department, outer.Target }, inner => new { Department = inner.InpatDoctorAccounting, Target = inner.Category },
                     (outer, inner) => new SpecialDto
                     {
                         Department = outer.Department,

performance/Performance.Services/GraphQLService.cs

@@ -34,7 +34,7 @@ PerforReportperformanceRepository reportperformanceRepository
 
         public List<ReportData> GetReportsInfo()
         {
-            var reports = repreportRepository.GetEntities();
+            var reports = repreportRepository.GetEntities(t => t.Sort < 5000);
             if (reports == null || !reports.Any()) return new List<ReportData>();
 
             var result = new List<ReportData>();