修改

2023-01-31 13:46:03 +08:00
parent e18b890f96
commit 9296871b28
7 changed files with 239 additions and 42 deletions
@@ -93,10 +93,18 @@ namespace IRaCIS.Application.Services


            // 找到对应的访视
-            List<OncologyVisitTaskInfo> oncologyVisits = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-            x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
-                   x.SubjectId == visitTask.SubjectId && x.IsAnalysisCreate == visitTask.IsAnalysisCreate && x.TaskState == TaskState.Effect && x.VisitTaskNum < visitTask.VisitTaskNum)
-                .Where(x => x.DoctorUserId == visitTask.DoctorUserId)
+            List<OncologyVisitTaskInfo> oncologyVisits = await _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)
                .OrderBy(x => x.VisitTaskNum).Select(x => new OncologyVisitTaskInfo()
                {
                    VisitName = x.SourceSubjectVisit.VisitName,
@@ -305,6 +313,9 @@ namespace IRaCIS.Application.Services
                SignTime = DateTime.Now,
            });
            await _visitTaskRepository.SaveChangesAsync();
+
+            // 创建任务关联关系
+            await this.CreateTaskRelated(inDto.OncologyTaskId);
            return ResponseOutput.Ok(true);
        }
    }