修改一版

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

@@ -2822,6 +2822,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.TaskAllocationRuleAddOrEdit">
             <summary> TaskAllocationRuleAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GenerateTaskCommand.OriginalVisitId">
+            <summary>
+            原任务的Id
+            </summary>
+        </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.GenerateTaskCommand.ReadingGenerataTaskList">
             <summary>
             阅片期
@@ -5629,6 +5634,13 @@
             IR影像阅片
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetHistoryGlobalInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetHistoryGlobalInfoInDto)">
+            <summary>
+            获取全局阅片历史记录
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveGlobalReadingInfoInDto)">
             <summary>
             保存全局阅片结果
@@ -5711,13 +5723,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult)">
-            <summary>
-            提交裁判问题
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingPastResultList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingPastResultListInDto)">
             <summary>
             获取既往结果
@@ -5740,7 +5745,21 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto)">
             <summary>
-            提交问题
+            提交访视阅片问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult)">
+            <summary>
+            提交裁判问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveGlobalReadingInfoInDto)">
+            <summary>
+            提交全局阅片结果
             </summary>
             <param name="inDto"></param>
             <returns></returns>

IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs

@@ -76,6 +76,17 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> SetTrialJudgyInfo(SetTrialJudgyInfoInDto inDto)
         {
+
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
+
+            var judgeCount = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion)
+                  .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
+                 .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null).CountAsync();
+
+            if (judgeCount == 0&&(inDto.ArbitrationRule== ArbitrationRule.Visit|| inDto.ArbitrationRule == ArbitrationRule.Reading))
+            {
+                throw new BusinessValidationFailedException("无裁判问题却有仲裁对象,操作失败");
+            }
             await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
             {
                 ArbitrationRule = inDto.ArbitrationRule,

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

@@ -54,6 +54,18 @@ namespace IRaCIS.Core.Application
         [NonDynamicMethod]
         public async Task<IResponseOutput> TrialReadingInfoSign(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("配置了裁判问题但未配置裁判规则,操作失败");
+            }
+
             await _trialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialId, x => new Trial()
             {
                 ReadingInfoSignTime = DateTime.Now