From 14f8093529ece2a2fe1db201d0ea7b0bef366104 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 20 Sep 2022 16:33:20 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs      | 15 +++++++++++++++
 .../Service/Reading/ReadingImageTaskService.cs    |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e0859398e..3ded3d0be 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -36,6 +36,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public int RowIndex { get; set; }
 
+        /// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType? QuestionGenre { get; set; }
+
+        /// <summary>
+        /// 问题类型
+        /// </summary>
+        public TableQuestionType? TableQuestionType { get; set; }
+
+        /// <summary>
+        /// 字典code
+        /// </summary>
+        public string DictionaryCode { get; set; }
+
         /// <summary>
 		/// 问题类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 40f121233..b791e0dea 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -356,6 +356,8 @@ namespace IRaCIS.Application.Services
                 IsShowInDicom = x.IsShowInDicom,
                 Type = x.Type,
                 QuestionType=x.QuestionType,
+                QuestionGenre=x.QuestionGenre,
+                DictionaryCode =x.DictionaryCode,
                 TypeValue = x.TypeValue,
                 QuestionName = x.QuestionName,
                 ShowOrder = x.ShowOrder,
@@ -371,6 +373,9 @@ namespace IRaCIS.Application.Services
                     QuestionId = x.Id,
                     IsShowInDicom = x.IsShowInDicom,
                     QuestionName = x.QuestionName,
+
+                    QuestionGenre = x.QuestionGenre,
+                    DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
                     QuestionType=x.QuestionType,
                     TypeValue = x.TypeValue,
@@ -416,6 +421,8 @@ namespace IRaCIS.Application.Services
                             QuestionId = x.ReadingQuestionId,
                             TableQuestionId = x.Id,
                             Type = x.Type,
+                            TableQuestionType = x.TableQuestionType,
+                            DictionaryCode = x.DictionaryCode,
                             QuestionMark = x.QuestionMark,
                             TypeValue = x.TypeValue,
                             RowIndex = row.RowIndex,