Compare commits

..

No commits in common. "745ab5cb25304f4c52b6742d0cd11bfdcdce6bf1" and "b174a72709ea135a79ceee81db4d978b2cbb92fc" have entirely different histories.

1 changed files with 2 additions and 2 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)) .Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }) .GroupBy(t => new { t.SubjectId, t.VisitTaskNum })
.Where(g => g.Count() == 2) .Where(g => g.Count() == 2)
.Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum } ).Distinct().Count(); .Select(g => g.Key.VisitTaskNum).Distinct().Count();
exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
//找到阅片期已阅片完 //找到阅片期已阅片完
@ -2475,7 +2475,7 @@ namespace IRaCIS.Core.Application.Service.Common
.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }) .GroupBy(t => new { t.SubjectId, t.VisitTaskNum })
//裁判不要求做完 //裁判不要求做完
.Where(g => g.Count() == 2 && g.Any(c => c.JudgeVisitTaskId != null)) .Where(g => g.Count() == 2 && g.Any(c => c.JudgeVisitTaskId != null))
.Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum }).Distinct().Count(); .Select(g => g.Key.VisitTaskNum).Distinct().Count();
//3、裁判认同数J触发裁判的阅片期中阅片人被裁判认同的阅片期数量 //3、裁判认同数J触发裁判的阅片期中阅片人被裁判认同的阅片期数量