From db23c918cfa28e181f44ef8ac0f16e30c545d363 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 14 Jul 2022 11:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 82 +++++++++++++++----
 .../DTO/TaskConsistentRuleViewModel.cs        |  2 -
 .../Service/Allocation/VisitTaskService.cs    |  4 +-
 3 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b0ed2ad32..9f7bfeb83 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3869,42 +3869,77 @@
             仲裁规则/对象
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingInfoSignTime">
             <summary>
-            阅片模式
+            阅片信息签名时间
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsArbitrationReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.Id">
             <summary>
-            仲裁阅片
+            pageId
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsClinicalReading">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.TrialId">
             <summary>
-            肿瘤学阅片
+            项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingTaskViewInOrder">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.PageName">
             <summary>
-            读片任务显示是否顺序
+            分页名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsEnable">
             <summary>
-            任务组织级别
+            是否启用
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsImageStandard">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsPublicPage">
             <summary>
-            图像是否有标注
+            是否公共分页
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowSubjectInfo">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateTime">
             <summary>
-            阅片是否显示受试者信息
+            创建时间
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowPreviousResults">
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateUserId">
+            <summary>
+            创建用户ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ShowOrder">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.PageName">
+            <summary>
+            分页名称
+            </summary>
+        </member>
+        <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>
@@ -3964,7 +3999,22 @@
             答案组合
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.TrialId">
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.JudgeType">
+            <summary>
+            裁判类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadingCriterion.CriterionName">
+            <summary>
+            标准
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingInfoSignTime">
+            <summary>
+            阅片信息签名时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.DigitPlaces">
             <summary>
             修约小数点
             </summary>
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
index a6df371d2..03685097f 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
@@ -122,8 +122,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public Arm ArmEnum { get; set; }
 
 
-        [JsonIgnore]
-        public VisitTask GroupFirstVisitTask { get; set; }
     }
 
     public class VisitTaskSimpleDTO :VisitTaskGroupSimpleDTO
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index e3e5d0d0d..f6723847c 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1309,7 +1309,7 @@ namespace IRaCIS.Core.Application.Service
         /// PM  设置任务 退回
         /// </summary>
         /// <returns></returns>
-        [HttpGet("{trialId:guid}/{taskId:guid}")]
+        [HttpPut("{trialId:guid}/{taskId:guid}")]
         public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId)
         {
 
@@ -1518,7 +1518,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="taskId"></param>
         /// <param name="isReReading"></param>
         /// <returns></returns>
-        [HttpGet("{taskId:guid}/{isReReading;bool}")]
+        [HttpGet("{taskId:guid}/{isReReading:bool}")]
         public async Task<List<VisitTaskSimpleView>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading)
         {
             var filterObj = (await _visitTaskRepository.FirstOrDefaultNoTrackingAsync(t => t.Id == taskId)).IfNullThrowException();