Uat_Study
he 2022-12-21 14:30:23 +08:00 committed by {872297557@qq.com}
parent f78f1faa7c
commit a86bda506a
1 changed files with 3 additions and 1 deletions

View File

@ -170,13 +170,14 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
// 有序
if (medicalReviewInfo.IsReadingTaskViewInOrder) if (medicalReviewInfo.IsReadingTaskViewInOrder)
{ {
medicalReviewInfo.TaskList = await _visitTaskRepository medicalReviewInfo.TaskList = await _visitTaskRepository
.WhereIf(taskInfo.ArmEnum == Arm.JudgeArm, x => x.ArmEnum == Arm.JudgeArm) .WhereIf(taskInfo.ArmEnum == Arm.JudgeArm, x => x.ArmEnum == Arm.JudgeArm)
.WhereIf(taskInfo.ArmEnum != Arm.JudgeArm, x => x.ArmEnum != Arm.JudgeArm) .WhereIf(taskInfo.ArmEnum != Arm.JudgeArm, x => x.ArmEnum != Arm.JudgeArm)
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
.Where(x => x.TaskState == TaskState.Effect) .Where(x => x.TaskState == TaskState.Effect||x.Id== taskInfo.Id)
.Where(x => x.SubjectId == taskInfo.SubjectId .Where(x => x.SubjectId == taskInfo.SubjectId
&& x.ArmEnum == taskInfo.ArmEnum && x.ArmEnum == taskInfo.ArmEnum
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
@ -240,6 +241,7 @@ namespace IRaCIS.Core.Application.Service
}); });
} }
// 无序
else else
{ {
medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.Id == taskInfo.Id).Select(x => new TaskInfo() medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.Id == taskInfo.Id).Select(x => new TaskInfo()