From e628fd0dc78f6b468045a724631fe06f3cbf5051 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Oct 2022 11:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingImageTaskService.cs       | 11 +++++++++--
 .../Service/Reading/ReadingQuestionService.cs         |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

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