From d529d5c52fd8bf469c268e146842a8b63b883aad Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Nov 2023 17:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=B4=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9C=80=E8=A6=81=E5=90=8C=E6=AD=A501?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/IRaCIS.Core.API.csproj                         | 2 +-
 .../Service/Reading/ReadingPeriod/ReadModuleService.cs         | 3 ++-
 .../Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index ad4a9289f..c3c264151 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -14,7 +14,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>.\IRaCIS.Core.API.xml</DocumentationFile>
-    <NoWarn>1701;1702;1591;CS1570;</NoWarn>
+    <NoWarn>1701;1702;1591;1570;</NoWarn>
     <OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
index 17017cf77..4bd4fc119 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
@@ -203,7 +203,8 @@ namespace IRaCIS.Application.Services
                 IsExistsSubjectClinicalData= await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId&&x.ClinicalDataLevel== ClinicalLevel.Subject && x.IsConfirm&&x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId== dto.TrialReadingCriterionId)),
                 IsExistsVisitClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.SubjectVisit && x.IsConfirm && x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == dto.TrialReadingCriterionId)),
                 IsExistsReadingClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.ImageRead && x.IsConfirm && x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == dto.TrialReadingCriterionId)),
-                IsGlobalReading= criterionInfo.IsGlobalReading,
+                IsExistsOncologyReadClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.OncologyRead && x.IsConfirm && x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == dto.TrialReadingCriterionId)),
+                IsGlobalReading = criterionInfo.IsGlobalReading,
                 IsReadingPeriod=criterionInfo.IsReadingPeriod,
                 ReadingInfoSignTime=criterionInfo.ReadingInfoSignTime,
                 ExistClinicalData=await  _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == dto.TrialReadingCriterionId)),
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index c2b745161..68837dbd2 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -97,7 +97,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 是否显示详情
 		/// </summary>
-		public bool IsShowDetail { get; set; }
+		public bool IsShowDetail { get; set; } = true;
 
 		/// <summary>
 		/// 同步时间