修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -4805,6 +4805,14 @@
             <param name="query"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.TrialConfigService.TrialReadingInfoSignVerify(IRaCIS.Core.Application.Contracts.TrialReadingInfoSignInDto)">
+            <summary>
+            阅片信息签名验证接口
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.TrialConfigService.TrialReadingInfoSign(IRaCIS.Core.Application.Contracts.TrialReadingInfoSignInDto)">
             <summary>
             阅片信息签名

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -46,6 +46,30 @@ namespace IRaCIS.Core.Application
         }
 
 
+        /// <summary>
+        /// 阅片信息签名验证接口
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
+        [HttpPost]
+        public async Task<IResponseOutput> TrialReadingInfoSignVerify(TrialReadingInfoSignInDto inDto)
+        {
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
+            var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
+                .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
+               .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null)
+               .AnyAsync();
+
+            if (existsJudge)
+            {
+                throw new BusinessValidationFailedException("有裁判问题未配置产生裁判阅片任务的条件,操作失败！");
+            }
+
+            return ResponseOutput.Ok(true);
+        }
+
+
         /// <summary>
         /// 阅片信息签名
         /// </summary>
@@ -524,8 +548,20 @@ namespace IRaCIS.Core.Application
                 trialConfig.IsReadingShowSubjectInfo = false;
                 trialConfig.ArbitrationRule = ArbitrationRule.Visit;
             }
+
+          
+
             _mapper.Map(trialConfig, trialInfo);
 
+            if (trialInfo.IsGlobalReading && (trialInfo.IsArbitrationReading??false))
+            {
+                trialInfo.ArbitrationRule = ArbitrationRule.Reading;
+            }
+
+            if (!trialInfo.IsGlobalReading && (trialInfo.IsArbitrationReading ?? false))
+            {
+                trialInfo.ArbitrationRule = ArbitrationRule.Visit;
+            }
             trialInfo.UpdateTime = DateTime.Now;
 
             // 修改临床数据

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -232,7 +232,7 @@ namespace IRaCIS.Core.Domain.Models
         /// <summary>
         /// ÖٲùæÔò
         /// </summary>
-        public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
+        public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
 
 
         public int ChangeDefalutDays { get; set; } = 5;