From 7bb83283324b78e177bdbf226dfb6e89be7acadf Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 19 Oct 2022 16:08:39 +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

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 11 +++++++++++
 .../ReadingImageTask/ReadingJudgeTaskService.cs      | 12 +++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index d633cb05b..aab646816 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1046,6 +1046,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string QuestionName { get; set; }
 
+
+        /// <summary>
+        /// 问题类型
+        /// </summary>
+        public TableQuestionType? QuestionGenre { get; set; }
+
+        /// <summary>
+        /// 字典code
+        /// </summary>
+        public string DictionaryCode { get; set; } = string.Empty;
+
         public dynamic Answer { get; set; }
 
         public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index d58f7c7a2..1c01fa04e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -135,7 +135,9 @@ namespace IRaCIS.Application.Services
                         {
                             Answer = x.Answer,
                             QuestionId = x.ReadingQuestionTrial.Id,
-                            QuestionName = x.ReadingQuestionTrial.QuestionName
+                            QuestionName = x.ReadingQuestionTrial.QuestionName,
+                            QuestionGenre=x.ReadingQuestionTrial.QuestionGenre,
+                            DictionaryCode=x.ReadingQuestionTrial.DictionaryCode,
 
                         }).ToListAsync(),
                         });
@@ -178,7 +180,9 @@ namespace IRaCIS.Application.Services
 
                                 Answer = x.Answer,
                                 QuestionId = x.QuestionId.Value,
-                                QuestionName = x.QuestionName
+                                QuestionName = x.QuestionName,
+                                QuestionGenre=x.QuestionGenre,
+                                DictionaryCode=x.DictionaryCode,
                             }).ToList()
                         };
 
@@ -212,7 +216,9 @@ namespace IRaCIS.Application.Services
 
                                     Answer = x.Answer,
                                     QuestionId = x.QuestionId.Value,
-                                    QuestionName = x.QuestionName
+                                    QuestionName = x.QuestionName,
+                                    QuestionGenre = x.QuestionGenre,
+                                    DictionaryCode = x.DictionaryCode,
                                 }).ToList()
                             };