diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 4f24f6d69..bccfb7fb9 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1829,7 +1829,10 @@ namespace IRaCIS.Application.Services switch (taskInfo.ReadingCategory) { case ReadingCategory.Visit: - needReadList = await _readModuleRepository.Where(x => x.SubjectVisitId == taskInfo.SourceSubjectVisitId && x.ReadingSetType == ReadingSetType.ImageReading) + needReadList = await _readModuleRepository.Where(x => x.SubjectVisitId == taskInfo.SourceSubjectVisitId && + + x.TrialReadingCriterionId==taskInfo.TrialReadingCriterionId&& + x.ReadingSetType == ReadingSetType.ImageReading) .Select(x => new ReadingGenerataTaskDTO { IsUrgent = x.IsUrgent ?? false, @@ -1855,7 +1858,11 @@ namespace IRaCIS.Application.Services // 肿瘤学 case ReadingCategory.Global: var subjectVisitId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync(); - var oncologyReadId = await _readModuleRepository.Where(x => x.SubjectVisitId == subjectVisitId && x.ModuleType == ModuleTypeEnum.Oncology).Select(x => x.Id).FirstOrDefaultAsync(); + var oncologyReadId = await _readModuleRepository.Where(x => x.SubjectVisitId == subjectVisitId && x.ModuleType == ModuleTypeEnum.Oncology + && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId + + + ).Select(x => x.Id).FirstOrDefaultAsync(); await AddOncologyTask(oncologyReadId); break; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index f666133e9..0bfa45b43 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -740,6 +740,7 @@ namespace IRaCIS.Application.Services }).ToListAsync(); await _readingCriterionDictionaryRepository.AddRangeAsync(criterionDictionaryList); + await _readingCriterionDictionaryRepository.SaveChangesAsync(); #endregion