修改阅片期导表
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-12-10 18:16:50 +08:00
parent a92fa86809
commit 81b56c03b7
1 changed files with 4 additions and 3 deletions

View File

@ -2467,7 +2467,7 @@ namespace IRaCIS.Core.Application.Service.Common
.Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
.GroupBy(t => new { t.SubjectId, t.VisitTaskNum })
.Where(g => g.Count() == 2)
.Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum } ).Distinct().Count();
.Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum }).Distinct().Count();
exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
//找到阅片期已阅片完
@ -2495,15 +2495,16 @@ namespace IRaCIS.Core.Application.Service.Common
//触发裁判的阅片期的数量 并且裁判要求做完
TotalJudgeCount = g
.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned)
.Select(t => t.VisitTaskNum).Distinct().Count(),
.Select(t => new { t.SubjectId, t.VisitTaskNum }).Distinct().Count(),
JudgeAgreeCount = g
.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned)
.Where(t => t.JudgeVisitTask.JudgeResultTaskId == t.Id)
.Select(t => t.VisitTaskNum).Distinct().Count(),
.Select(t => new { t.SubjectId, t.VisitTaskNum }).Distinct().Count(),
}).ToList();
#endregion
return await ExcelExportHelper.DataExportAsync(StaticData.Export.ReadingPeriodJudgeRatio_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment);