修改一版

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

@@ -3834,14 +3834,14 @@
             阅片平台
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ImagePlatform">
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
             <summary>
-            阅片平台
+            任务组织级别
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsGlobalReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsImageIabeled">
             <summary>
-            全局阅片
+            影像是否有标注
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowSubjectInfo">
@@ -3856,7 +3856,7 @@
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ArbitrationRule">
             <summary>
-            仲裁规则
+            仲裁规则/对象
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingInfoSignTime">
@@ -3865,54 +3865,83 @@
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.Id">
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
             <summary>
-            阅片模式
+            pageId
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsArbitrationReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.TrialId">
             <summary>
-            仲裁阅片
+            项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsClinicalReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.PageName">
             <summary>
-            肿瘤学阅片
+            分页名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingTaskViewInOrder">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsEnable">
             <summary>
-            读片任务显示是否顺序
+            是否启用
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsPublicPage">
             <summary>
-            任务组织级别
+            是否公共分页
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsImageStandard">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateTime">
             <summary>
-            图像是否有标注
+            创建时间
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowSubjectInfo">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateUserId">
             <summary>
-            阅片是否显示受试者信息
+            创建用户ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowPreviousResults">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ShowOrder">
             <summary>
-            阅片是否显示既往结果
+            排序
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialReadingCriterionList">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.PageName">
             <summary>
-            项目标准集合
+            分页名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialJudgeQuestionList">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.QuestionName">
             <summary>
-            项目裁判问题集合
+            问题名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentTriggerValue">
+            <summary>
+            父问题触发
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentQuestionName">
+            <summary>
+            父问题名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsRequired">
+            <summary>
+            是否是必须
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.TypeValue">
+            <summary>
+            类型值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsEnable">
+            <summary>
+            是否启用
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsJudgeQuestion">
@@ -3940,32 +3969,32 @@
             答案组合
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.TrialId">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.JudgeType">
             <summary>
-            项目ID
+            裁判类型
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingMode">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
             <summary>
-            阅片方式
+            问题名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ImagePlatform">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.AnswerGroup">
             <summary>
-            阅片平台
+            答案分组
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsGlobalReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.AnswerCombination">
             <summary>
-            全局阅片
+            答案组合
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingType">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.JudgeType">
             <summary>
-            阅片模式
+            裁判类型
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsArbitrationReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadingCriterion.CriterionName">
             <summary>
             标准
             </summary>
@@ -3988,7 +4017,21 @@
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingCriterionPageList">
             <summary>
             项目分页
-            仲裁阅片
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.TrialQuestionList">
+            <summary>
+            项目问题集合
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingCriterionInDto.FormType">
+            <summary>
+            表单类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingCriterionInDto.DigitPlaces">
+            <summary>
+            修约小数点
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.TrialId">
@@ -4018,7 +4061,7 @@
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingShowPreviousResults">
             <summary>
-            阅片是否显示既往结果
+            IR阅片是否显示既往结果
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ArbitrationRule">

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

@@ -128,7 +128,8 @@ namespace IRaCIS.Core.Application
             };
 
 
-            result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId)
+            result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
+            &&x.ReadingCriterionPageId==null)
               .ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();