修改

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs

@@ -296,7 +296,9 @@ namespace IRaCIS.Application.Services
 
                 var visitId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
 
-                var oncologModuleId = await _readModuleRepository.Where(x => x.SubjectVisitId == visitId && x.ModuleType == ModuleTypeEnum.Oncology).Select(x => x.Id).FirstOrDefaultAsync();
+                var oncologModuleId = await _readModuleRepository.Where(x => x.SubjectVisitId == visitId && x.ModuleType == ModuleTypeEnum.Oncology
+                &&x.TrialReadingCriterionId== taskInfo.TrialReadingCriterionId
+                ).Select(x => x.Id).FirstOrDefaultAsync();
 
                 await AddOncologyTask(oncologModuleId);
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -209,7 +209,9 @@ namespace IRaCIS.Application.Services
             if (readModuleInfo != null)
             {
                 // 先找到对应的全局阅片模块Id
-                var globalreadModuleId = await _readModuleRepository.Where(x => x.SubjectVisitId == readModuleInfo.SubjectVisitId && x.ModuleType == ModuleTypeEnum.Global).Select(x => x.Id).FirstOrDefaultAsync();
+                var globalreadModuleId = await _readModuleRepository.Where(x => x.SubjectVisitId == readModuleInfo.SubjectVisitId &&
+                x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId&&
+                x.ModuleType == ModuleTypeEnum.Global).Select(x => x.Id).FirstOrDefaultAsync();
 
                 // 找到一个全局阅片任务是否有裁判任务