From 366aba68ce456fb14b92ecfa238add94c65e46d7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 17 Jul 2023 10:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=99=90=E5=88=B6=20?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/TrialDocumentService.cs         | 12 +++++++++++-
 .../Service/SiteSurvey/TrialSiteSurveyService.cs     |  4 ++--
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs      |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
index 3a9acc25e..9defbfcbb 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@@ -235,7 +235,17 @@ namespace IRaCIS.Core.Application.Services
             var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true 
             &&t.TrialCriterionAdditionalAssessmentTypeList.Any(c=>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected==true)).Any();
 
-            return ResponseOutput.Ok<PageOutput<UnionDocumentWithConfirmInfoView>>( result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, TrialStatusStr = trialInfo.TrialStatusStr,TrialConfig= trialTaskConfig });
+
+            var isAllOnlySRReading = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned).All(t => t.ReadingDivisionEnum == ReadingDivisionEnum.OnlySR);
+
+            return ResponseOutput.Ok<PageOutput<UnionDocumentWithConfirmInfoView>>( result, new {
+                NeedSignCount = needSignTrialDocCount + needSignSystemDocCount,
+                NeedSignTrialDocCount = needSignTrialDocCount, 
+                NeedSignSystemDocCount = needSignSystemDocCount,
+                IsAllOnlySRReading= isAllOnlySRReading,
+                IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask,
+                TrialStatusStr = trialInfo.TrialStatusStr,
+                TrialConfig= trialTaskConfig });
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 7d5093d80..26d48ddf0 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -750,9 +750,9 @@ namespace IRaCIS.Core.Application.Contracts
                 {
                     var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
 
-                    if(!currentUserList.Any(t=>t.Code=="1") || !currentUserList.Any(t => t.Code == "4"))
+                    if(!currentUserList.Any(t=>t.Code=="1") || !currentUserList.Any(t => t.Code == "5"))
                     {
-                        throw new BusinessValidationFailedException("本次提交，必须有CRC和影像负责人信息");
+                        throw new BusinessValidationFailedException("本次提交，必须有CRC和影像阅片人信息");
                     }
                 }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 287b8c2ad..9da0f6e88 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -222,6 +222,8 @@ namespace IRaCIS.Core.Application.Contracts
         public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit;
 
         public bool IsImageConsistencyVerification { get; set; } = true;
+
+        public bool IsMedicalReview { get; set;} 
     }
 
     public class TrialTaskConfigView : TrialTaskConfig