返回后台文件测试

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -2290,7 +2290,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     .GroupBy(t => new { t.SubjectId, t.DoctorUserId, t.SourceSubjectVisitId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
 
-                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge).Count();
+                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count();
 
                 //3、裁判认同数M：触发裁判的受试者访视中，阅片人被裁判认同的访视数量；
                 //4、总裁判数N：阅片人所阅的受试者访视中，触发裁判的访视数量；
@@ -2304,7 +2304,7 @@ namespace IRaCIS.Core.Application.Service.Common
                         FullName = g.Key.FullName,
 
                         //访视产生裁判的访视数量
-                        TotalJudgeCount = g.Where(t => t.JudgeVisitTaskId != null).Count(),
+                        TotalJudgeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState ==  ReadingTaskState.HaveSigned).Count(),
 
                         JudgeAgreeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id).Count(),
 
@@ -2337,7 +2337,7 @@ namespace IRaCIS.Core.Application.Service.Common
                   && t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Any(t => t.ReadingCategory == ReadingCategory.Judge)
                 ).Count();
 
-                var doctorList = _visitTaskRepository.Where(comonTaskFilter)
+                var doctorList = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
                     .GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
                     .Select(g => new DoctorJudgeRatio()
                     {
@@ -2369,7 +2369,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 //3、裁判认同数J：触发裁判的阅片期中，阅片人被裁判认同的阅片期数量；
                 //4、总裁判数Q：阅片人完成阅片的阅片期中，触发裁判的阅片期数量；
 
-                var doctor2List = _visitTaskRepository.Where(comonTaskFilter)
+                var doctor2List = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
                   .GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
                   .Where(g => g.Any(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null))
                   .Select(g => new DoctorJudgeRatio()
@@ -2388,9 +2388,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 #endregion
 
+                exportInfo.DoctorSubjectStatList = doctorList;
 
                 exportInfo.DoctorPeriodStatList = doctor2List;
-                exportInfo.DoctorSubjectStatList = doctorList;
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.ReadingPeriodJudgeRatio_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment);