From df9d4fa7e5b03bde3197e930f9ae5e149532db5d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 23 Jun 2022 13:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 32 ++++++++++++++++++-
 .../Service/Reading/ReadModuleService.cs      |  2 +-
 .../Reading/ReadingImageTaskService.cs        |  2 +-
 .../Reading/ReadingPeriodSetService.cs        |  2 +-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  |  8 ++---
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 7035be90c..74828f43c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -152,6 +152,21 @@
             <param name="assignSubjectTaskToDoctorCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ApplyReReading(IRaCIS.Core.Application.ViewModel.ApplyReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
+            <summary>
+            申请重阅  1:IR  2:PM
+            </summary>
+            <param name="applyReReadingCommand"></param>
+            <param name="_visitTaskCommonService"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand)">
+            <summary>
+            确认重阅与否  1同意 2 拒绝
+            </summary>
+            <param name="agreeReReadingCommand"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
             <summary>
             系统模板文档配置表   
@@ -1175,6 +1190,21 @@
             标准
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.JudgeType">
+            <summary>
+            裁判类别
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.AnswerGroup">
+            <summary>
+            答案分组
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.AnswerCombination">
+            <summary>
+            答案组合
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto">
             <summary>
             
@@ -4259,7 +4289,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.TriggerJudgeQuestionNew(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.TriggerJudgeQuestion(System.Guid)">
             <summary>
             触发裁判任务(新)
             </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
index 32a64b3c0..ecc203f49 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
@@ -428,7 +428,7 @@ namespace IRaCIS.Application.Services
                 {
                     Id= NewId.NextGuid(),
                     SubjectId = dto.SubjectId,
-                    ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Read: ModuleTypeEnum.Oncology,
+                    ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Global: ModuleTypeEnum.Oncology,
                     IsUrgent = visit.IsUrgent,
                     ModuleName = dto.Name,
                     SubjectVisitId = visit.Id,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 6b1ececd7..e908266d4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -359,7 +359,7 @@ namespace IRaCIS.Application.Services
             Dictionary<ModuleTypeEnum, ReadingCategory> typeChange = new Dictionary<ModuleTypeEnum, ReadingCategory>();
             typeChange.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit);
             typeChange.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit);
-            typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod);
+            //typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod);
             typeChange.Add(ModuleTypeEnum.Global, ReadingCategory.Global);
             typeChange.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge);
             typeChange.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology);
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
index c78b1e6ad..064d67de5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
@@ -304,7 +304,7 @@ namespace IRaCIS.Application.Services
                     {
                         Id = NewId.NextGuid(),
                         SubjectId = item.SubjectVisit.SubjectId,
-                        ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Read : ModuleTypeEnum.Oncology,
+                        ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Global : ModuleTypeEnum.Oncology,
                         IsUrgent = item.SubjectVisit.IsUrgent,
                         ModuleName = item.ReadingPeriodSet.ReadingPeriodName,
                         SubjectVisitId = item.SubjectVisitId,
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 12792c7cf..c2f27f2cf 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -22,10 +22,10 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         OutPlanSubjectVisit = 1,
 
-        /// <summary>
-        /// 阅片期
-        /// </summary>
-        Read = 2,
+        ///// <summary>
+        ///// 阅片期
+        ///// </summary>
+        //Read = 2,
 
         /// <summary>
         /// 全局阅片