From 45c62387666a57fc5d10e9b4cc2ea8a79736c9bc Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 22 Nov 2022 11:39:40 +0800
Subject: [PATCH] x

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml    | 10 ++++++++++
 .../Service/Allocation/DTO/VisitTaskViewModel.cs       |  2 +-
 .../Service/Allocation/_MapConfig.cs                   |  2 +-
 .../Service/Reading/Dto/ReadingMedicalReviewDto.cs     |  2 ++
 .../MedicalAudit/ReadingMedicalReviewService.cs        |  3 ++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index f20cdcb40..9d3aee7a5 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -9046,6 +9046,16 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingTableQuestion(System.Guid,System.Nullable{System.Guid},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo})">
+            <summary>
+            获取表格问题及答案  只返回表格问题
+            </summary>
+            <param name="trialReadingCriterionId"></param>
+            <param name="taskId"></param>
+            <param name="tableAnswers"></param>
+            <param name="tableAnsweRowInfos"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo})">
             <summary>
             获取子元素
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index e0f6c5d75..35a1a430b 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsPMSetBack { get; set; }
 
         #region 标准配置
-        public string TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
         public string TrialReadingCriterionName { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index 97d99945e..fb87a66f0 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -199,7 +199,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName));
 
             CreateMap<TaskMedicalReview, TaskMedicalReviewView>().IncludeMembers(t => t.VisitTask)
-
+                 .ForMember(o => o.TrialReadingCriterionId, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.Id))
                  .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionName))
                   .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.ReadingTool))
                   .ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder))
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 49bf04fb0..72375feef 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public TaskState TaskState { get; set; }
 
+
+        public Guid TrialReadingCriterionId { get; set; }
         public string TrialReadingCriterionName { get; set; }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index 37c1b960a..c2f4d6060 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -622,7 +622,8 @@ namespace IRaCIS.Core.Application.Service
                     MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
                     IsInvalid=x.IsInvalid,
 
-                    TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName,
+                    TrialReadingCriterionId= x.VisitTask.TrialReadingCriterion.Id,
+                    TrialReadingCriterionName =x.VisitTask.TrialReadingCriterion.CriterionName,
                     ReadingTool= x.VisitTask.TrialReadingCriterion.ReadingTool,
 
                     IsReadingTaskViewInOrder = x.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder,