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

---
 IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs    | 1 +
 .../Service/Reading/ReadingImageTaskService.cs                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
index 4f5c0536..cb740208 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
@@ -345,6 +345,7 @@ namespace IRaCIS.Application.Services
                                    SubjectId = readModuleData.SubjectId,
                                    VisitNum=readModuleData.VisitNum,
                                    ReadingName = readModuleData.ModuleName,
+                                   
                                    ReadModuleId =readModuleData.Id,
                                    ReadingCategory = ReadingCategory.Oncology,
                                  }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 9a8d7520..f8f7ab9c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -2619,7 +2619,7 @@ namespace IRaCIS.Application.Services
 
                 // 判断阅片是否完成
                 if (judgeVisitTaskId == null && (await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModuleId && x.TaskState == TaskState.Effect && x.ReadingCategory == ReadingCategory.Global
-                         && x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate
+                         && x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate&&x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId
                        ).CountAsync() == (int)readingType))
                 {