XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改导出测试
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-12-10 21:30:36 +08:00
parent fcffa32e06
commit 91cde3f944
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -2425,27 +2425,16 @@ namespace IRaCIS.Core.Application.Service.Common
.Where(g => g.Count() == 2).Any())
.Count();
//最后一个已完成的全局 没产生裁判 （之前有裁判），不算入裁判量
exportInfo.judgeSubjectCount = _subjectRepository.Where(t => t.TrialId == inQuery.TrialId)
.Where(t => t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
.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 && g.Key.VisitTaskNum == g.Max(t => t.VisitTaskNum))
.Any(g => g.Any(t => t.JudgeVisitTaskId != null)))
.Count();
#region 废弃
////最后一个已完成的全局 没产生裁判 （之前有裁判），不算入裁判量
//exportInfo.judgeSubjectCount = _subjectRepository.Where(t => t.TrialId == inQuery.TrialId)
// .Where(t => t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
// .Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
// .GroupBy(task => new { task.SubjectId, task.VisitTaskNum })
// .Where(g => g.Count() == 2)
// .FirstOrDefault().Any(t => t.JudgeVisitTaskId != null)
// )
// .GroupBy(t => new { t.SubjectId, t.VisitTaskNum })
// .Where(g => g.Count() == 2 )
// .Any(g => g.Any(t => t.JudgeVisitTaskId != null)))
// .Count();
//exportInfo.judgeSubjectCount = _subjectRepository.Where(t => t.TrialId == inQuery.TrialId)
// .Where(t => t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
// .Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
@ -2454,6 +2443,21 @@ namespace IRaCIS.Core.Application.Service.Common
// .Any(g => g.OrderByDescending(c => c.VisitTaskNum).FirstOrDefault().JudgeVisitTaskId != null)
// )
// .Count();
#endregion
var subjectReadingPeriodList= _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
.Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
.GroupBy(t => new { t.SubjectId, t.VisitTaskNum ,t.JudgeVisitTaskId })
.Where(g => g.Count() == 2)
.Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum, g.Key.JudgeVisitTaskId })
.ToList();
exportInfo.judgeSubjectCount = subjectReadingPeriodList.GroupBy(x => x.SubjectId) // 按 SubjectId 分组
.Select(g => g.OrderByDescending(x => x.VisitTaskNum).First()) // 每组取 VisitTaskNum 最大的记录
.Where(t => t.JudgeVisitTaskId != null)
.Count();
exportInfo.DoctorSubjectStatList = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
//筛选全局 已完成的任务
@ -2479,6 +2483,8 @@ namespace IRaCIS.Core.Application.Service.Common
.Select(t => t.SubjectId).Distinct().Count(),
}).ToList();
#endregion
#region 阅片期部分