From b4ffae867bee875ee8a145996bda920547c61ad6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 3 Jan 2023 14:10:42 +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

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs   |  7 +++++++
 .../Service/Reading/Dto/ReadingQuestionViewModel.cs    | 10 ++++++++++
 .../Reading/ReadingCriterion/ReadingQuestionService.cs |  6 +++++-
 .../ReadingImageTask/ReadingImageTaskService.cs        |  6 ++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index b55de1ed..406250b5 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -265,6 +265,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid RowId { get; set; }
     }
 
+    //public class ChangeCalculationAnswerInDto
+    //{
+    //    public Guid VisitTaskId { get; set; }
+
+    //    public 
+    //}
+
     public class ReadClinicalDataInDto
     {
         [NotDefault]
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 552b9e09..03711b06 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -1157,6 +1157,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 问题类型
+		/// </summary>
+		public TableQuestionType? QuestionGenre { get; set; }
+
 		/// <summary>
 		/// 类型值
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 202ad6fa..dea63ebe 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -245,7 +245,9 @@ namespace IRaCIS.Application.Services
                 .Select(x => new CriterionOtherQuestionOutDto()
                 {
                     QuestionId = x.Id,
-                    QuestionName = x.QuestionName,
+                    DictionaryCode=x.DictionaryCode,
+                    QuestionGenre=x.QuestionGenre,
+                    QuestionName = x.QuestionName.LanguageName(x.QuestionEnName,_userInfo.IsEn_Us),
                     TypeValue = x.TypeValue,
                     GroupName = x.GroupName,
                 }).ToListAsync();
@@ -551,6 +553,8 @@ namespace IRaCIS.Application.Services
                 .Select(x => new CriterionOtherQuestionOutDto()
                 {
                     QuestionId = x.Id,
+                    DictionaryCode=x.DictionaryCode,
+                    QuestionGenre=x.QuestionGenre,
                     QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                     TypeValue = x.TypeValue,
                     GroupName = x.GroupName,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 17e5eea2..e8204e49 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -120,6 +120,12 @@ namespace IRaCIS.Application.Services
             this._trialEmailNoticeConfigService = trialEmailNoticeConfigService;
         }
 
+
+        public async Task ChangeCalculationAnswer()
+        {
+            
+        }
+
         /// <summary>
         /// 阅读临床数据
         /// </summary>