Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

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>
 

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)),

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>
 		/// 同步时间