From c8fa42b304c6569dd849c692021c7a8861e00d9f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 26 Aug 2022 13:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 22 +++++++++++++++++++
 .../Reading/ReadingImageTaskService.cs        |  6 ++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index f6c475e1c..46e629946 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -984,6 +984,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string OrderMark { get; set; } = string.Empty;
 
 
+        /// <summary>
+        /// 关联父问题
+        /// </summary>
+        public Guid? DependParentId { get; set; }
+
+        /// <summary>
+        /// 是否关联
+        /// </summary>
+        public IsDepend? IsDepend { get; set; }
+
+        /// <summary>
+        /// 表格问题类型
+        /// </summary>
+        public TableQuestionType? TableQuestionType { get; set; }
+
+
+        /// <summary>
+        /// 问题标识
+        /// </summary>
+        public QuestionMark? QuestionMark { get; set; }
+
+
 
         //public List<TableQuestionDataInfo> TableQuestions { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 4d057b322..212710563 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1052,7 +1052,11 @@ namespace IRaCIS.Application.Services
                 GroupName = string.Empty,
                 Id = x.Id,
                 Type=x.Type,
-                TypeValue=x.TypeValue,
+                TableQuestionType=  x.TableQuestionType,
+                DependParentId=x.DependParentId,
+                IsDepend=x.IsDepend,
+                QuestionMark=x.QuestionMark,
+                TypeValue =x.TypeValue,
                 RelevanceId=x.RelevanceId,
                 RelevanceValue=x.RelevanceValue,
                 ImageCount = 0,