diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 44b414aa0..fceea7ca6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -426,9 +426,10 @@ namespace IRaCIS.Application.Services SignTime = DateTime.Now, JudgeResultImagePath = string.Join(',', inDto.JudgeResultImagePathList), }); - await _visitTaskRepository.SaveChangesAsync(); - // 需要判断是否添加肿瘤学任务 - var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); + var result = await _visitTaskRepository.SaveChangesAsync(); + + // 需要判断是否添加肿瘤学任务 + var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); if (taskInfo.ReadingCategory == ReadingCategory.Visit) { @@ -461,7 +462,7 @@ namespace IRaCIS.Application.Services } - var result = await _visitTaskRepository.SaveChangesAsync(); + // 创建任务关联关系 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs index b4efec01f..594aa2137 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs @@ -432,13 +432,15 @@ namespace IRaCIS.Application.Services else { - globalOrVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect + var visitTask = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId - && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.Id).FirstOrDefaultAsync(); + && x.ReadingCategory==ReadingCategory.Visit + && x.ReadingTaskState == ReadingTaskState.HaveSigned).FirstNotNullAsync(); + + globalOrVisitTaskId = visitTask.Id; + + var judgeVisitTaskId = visitTask.JudgeVisitTaskId; - var judgeVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect - &&x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId - && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.JudgeVisitTaskId).FirstOrDefaultAsync(); // 要判断是否为老裁判任务的Id if (judgeVisitTaskId != null) {