修改

2023-01-31 13:46:03 +08:00
parent e18b890f96
commit 9296871b28
7 changed files with 239 additions and 42 deletions
@@ -169,14 +169,31 @@ namespace IRaCIS.Application.Services
                result.JudgeTaskId = judgeInfo.Id;
                result.JudgeTaskName = judgeInfo.TaskBlindName;
            }
-         
+

            // 一致性分析按照doctorId 其他按照分组

-            result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-            x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
-                 x.SubjectId == taskInfo.SubjectId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && x.TaskState == TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
-               .Where(x => x.DoctorUserId == taskInfo.DoctorUserId)
+
+            var queruTask =  _visitTaskRepository.Where(x =>
+                   x.TrialId == taskInfo.TrialId &&
+                   x.SubjectId == taskInfo.SubjectId &&
+                   x.ReadingCategory == ReadingCategory.Visit &&
+                   x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
+                   x.ReadingTaskState == ReadingTaskState.HaveSigned &&
+                   x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
+                   x.ArmEnum == taskInfo.ArmEnum &&
+                   x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
+                   x.DoctorUserId == taskInfo.DoctorUserId &&
+                   x.TaskState == TaskState.Effect &&
+                   x.VisitTaskNum < taskInfo.VisitTaskNum);
+
+
+            if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
+            {
+                queruTask = _visitTaskRepository.Where(x => taskInfo.RelatedVisitTaskIdList.Contains(x.Id));
+            }
+
+            result.TaskList = await queruTask
                .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
                {
                    VisitName = x.TaskName,