From 6738f6a90a71dd9723d0877f44108020b97ba42a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 6 Jan 2023 11:20:45 +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/ReadingQuestionViewModel.cs   | 22 +++++++++++++++++++
 .../Service/Reading/_MapConfig.cs             | 16 +++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index c1bd13cd8..5878d9df6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -826,6 +826,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public int? RelevanceShowOrder { get; set; }
 
+		/// <summary>
+		/// Relevance问题类型
+		/// </summary>
+		public TableQuestionType? RelevanceQuestionGenre { get; set; }
+
+		/// <summary>
+		/// Relevance字典code
+		/// </summary>
+		public string RelevanceDictionaryCode { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 图片数量
 		/// </summary>
@@ -1034,6 +1044,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public int? RelevanceShowOrder { get; set; }
 
 
+		/// <summary>
+		/// Relevance问题类型
+		/// </summary>
+		public TableQuestionType? RelevanceQuestionGenre { get; set; }
+
+		/// <summary>
+		/// Relevance字典code
+		/// </summary>
+		public string RelevanceDictionaryCode { get; set; } = string.Empty;
+
+
+
 		/// <summary>
 		/// 类型值
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 71c7fe46c..e0d240324 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -171,12 +171,14 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddOrUpdateReadingQuestionSystemInDto, ReadingQuestionSystem>();
             CreateMap<ReadingQuestionSystem, ReadingQuestionSystemView>()
-           .ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionSystem==null?string.Empty: s.ParentReadingQuestionSystem.QuestionName))
-             .ForMember(d => d.ParentQuestionShowOrder, u => u.MapFrom(s => s.ParentReadingQuestionSystem.ShowOrder))
+              .ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionSystem==null?string.Empty: s.ParentReadingQuestionSystem.QuestionName))
+              .ForMember(d => d.ParentQuestionShowOrder, u => u.MapFrom(s => s.ParentReadingQuestionSystem.ShowOrder))
               .ForMember(d => d.ParentDictionaryCode, u => u.MapFrom(s => s.ParentReadingQuestionSystem.DictionaryCode))
-               .ForMember(d => d.ParentQuestionGenre, u => u.MapFrom(s => s.ParentReadingQuestionSystem.QuestionGenre))
-             .ForMember(d => d.RelevanceShowOrder, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.ShowOrder));
-
+              .ForMember(d => d.ParentQuestionGenre, u => u.MapFrom(s => s.ParentReadingQuestionSystem.QuestionGenre))
+              .ForMember(d => d.RelevanceShowOrder, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.ShowOrder))
+              .ForMember(d => d.RelevanceDictionaryCode, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.DictionaryCode))
+              .ForMember(d => d.RelevanceQuestionGenre, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.QuestionGenre));
+            
 
             CreateMap<AddOrUpdateReadingQuestionCriterionTrialInDto, ReadingQuestionCriterionTrial>();
             CreateMap<ReadingQuestionCriterionTrial, ReadingQuestionCriterionTrialView>()
@@ -189,7 +191,9 @@ namespace IRaCIS.Core.Application.Service
             .ForMember(d => d.ParentQuestionShowOrder, u => u.MapFrom(s => s.ParentReadingQuestionTrial.ShowOrder))
              .ForMember(d => d.ParentQuestionGenre, u => u.MapFrom(s => s.ParentReadingQuestionTrial.QuestionGenre))
              .ForMember(d => d.ParentDictionaryCode, u => u.MapFrom(s => s.ParentReadingQuestionTrial.DictionaryCode))
-              .ForMember(d => d.RelevanceShowOrder, u => u.MapFrom(s => s.RelevanceReadingQuestionTrial.ShowOrder));
+              .ForMember(d => d.RelevanceShowOrder, u => u.MapFrom(s => s.RelevanceReadingQuestionTrial.ShowOrder))
+              .ForMember(d => d.RelevanceDictionaryCode, u => u.MapFrom(s => s.RelevanceReadingQuestionTrial.DictionaryCode))
+              .ForMember(d => d.RelevanceQuestionGenre, u => u.MapFrom(s => s.RelevanceReadingQuestionTrial.QuestionGenre)); ;
             #endregion
 
             #region IR阅片