From 2daa59da7f6b9a1ec8a1757c9559a47d9d36f8eb Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 26 Aug 2022 10:04:43 +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               | 25 +++++++++++++++++++
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  2 +-
 .../Reading/ReadingImageTaskService.cs        |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d37a424ea..0bb742381 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1585,6 +1585,16 @@
             文件路径
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData.PageName">
+            <summary>
+            分页名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData.IsPublicPage">
+            <summary>
+            是否公共分页
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetOncologyQuestion.EvaluationResult">
             <summary>
             评估结果
@@ -6952,6 +6962,21 @@
             IR影像阅片
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingQuestionAndAnswer(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingQuestionAndAnswerInDto)">
+            <summary>
+            获取表格问题及答案（2022-08-26）
+            </summary>
+            <param name="inDto"></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.Domain.Models.ReadingTableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo})">
+            <summary>
+            获取子元素
+            </summary>
+            <param name="item"></param>
+            <param name="questionlists"></param>
+            <param name="tableQuestionLists"></param>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetRelatedVisitTask(IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskInDto)">
             <summary>
             获取关联的阅片任务
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 1066b0e33..48d58ff69 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool? IsPublicPage { get; set; } = false;
 
-        public int PageShowOrder { get; set; }
+        public int? PageShowOrder { get; set; }
 
         public List<TrialReadQuestionData> Childrens { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index ad1e62a54..a6a6c450a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -226,7 +226,7 @@ namespace IRaCIS.Application.Services
         /// <param name="item"></param>
         /// <param name="questionlists"></param>
         /// <param name="tableQuestionLists"></param>
-        public void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<ReadingTableQuestionTrial> tableQuestionLists,List<ReadingTableQuestionAnswerInfo> tableAnswers)
+        private void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<ReadingTableQuestionTrial> tableQuestionLists,List<ReadingTableQuestionAnswerInfo> tableAnswers)
         {
             item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (item.Type == "group" && x.Type != "group" && x.ParentId == null && x.GroupName == item.GroupName)).ToList();
             item.TableQuestions = new TrialReadTableQuestion();