From 2733396e4c4b04885071c6270f1415838e87adb6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 19 Oct 2022 15:30:24 +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

---
 .../ReadingImageTask/ReadingJudgeTaskService.cs   |  2 ++
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs   | 15 +++++++++++----
 .../Service/TrialSiteUser/TrialConfigService.cs   |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index 0c6a9a546..0efeaa18c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -326,6 +326,7 @@ namespace IRaCIS.Application.Services
             if (visitTask.IsAnalysisCreate)
             {
                 visitTaskids = await _visitTaskRepository.Where(x => x.ArmEnum == visitTask.ArmEnum && x.TaskState == TaskState.Effect && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId
+                  &&x.TrialReadingCriterionId== visitTask.TrialReadingCriterionId
                   && x.SouceReadModuleId == visitTask.SouceReadModuleId && x.ReadingCategory != ReadingCategory.Judge && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.Id).ToListAsync();
 
             }
@@ -334,6 +335,7 @@ namespace IRaCIS.Application.Services
                 // 这里是非一致性分析产生的
                 visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory != ReadingCategory.Judge
                 && x.TaskState == TaskState.Effect
+                && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId
                 && x.IsAnalysisCreate == false
                 && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
             }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 036083462..66f3df22e 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -383,6 +383,13 @@ namespace IRaCIS.Core.Application.Contracts
         //读片任务显示是否顺序
         public bool IsReadingTaskViewInOrder { get; set; } = true;
 
+        public List<Guid> GlobalAssessTypeIds { get; set; }
+
+
+        /// <summary>
+        /// 全局阅片
+        /// </summary>
+        public bool IsGlobalReading { get; set; }
 
         /// <summary>
         /// 阅片工具
@@ -780,10 +787,10 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> GlobalAssessTypeIds { get; set; }
 
 
-        /// <summary>
-        /// 全局阅片
-        /// </summary>
-        public bool IsGlobalReading { get; set; }
+        ///// <summary>
+        ///// 全局阅片
+        ///// </summary>
+        //public bool IsGlobalReading { get; set; }
     }
 
     public class GetOncologySetInDto
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index b840b1403..e6193ce8a 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -157,11 +157,11 @@ namespace IRaCIS.Core.Application
         public async Task<IResponseOutput> SetGlobalReadingInfo(SetGlobalReadingInfoInDto inDto)
         {
 
-            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
-            {
-                IsGlobalReading = inDto.IsGlobalReading
+            //await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
+            //{
+            //    IsGlobalReading = inDto.IsGlobalReading
 
-            });
+            //});
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == ReadingCommon.GlobalAssess);
             await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.GlobalAssessTypeIds.Select(x => new ReadingCriterionDictionary
             {