From dcbb9fa39164cb7ffdb5cd1e7faf76977e38f3f3 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 3 Jan 2023 15:18:40 +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             |  4 ++++
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       | 11 ++++++++++
 .../Service/TrialSiteUser/_MapConfig.cs       |  2 ++
 4 files changed, 39 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 03711b068..c1bd13cd8 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -738,11 +738,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public TableQuestionType? QuestionGenre { get; set; }
 
+		/// <summary>
+		/// Parent问题类型
+		/// </summary>
+		public TableQuestionType? ParentQuestionGenre { get; set; }
+
+
 		/// <summary>
 		/// 字典code
 		/// </summary>
 		public string DictionaryCode { get; set; } = string.Empty;
 
+		/// <summary>
+		/// Parent字典code
+		/// </summary>
+		public string ParentDictionaryCode { get; set; } = string.Empty;
+
 
 		/// <summary>
 		/// 系统标准Id
@@ -941,6 +952,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public TableQuestionType? QuestionGenre { get; set; }
 
+		/// <summary>
+		/// Parent问题类型
+		/// </summary>
+		public TableQuestionType? ParentQuestionGenre { get; set; }
+
 
 		/// <summary>
 		/// 全局阅片显示类型
@@ -959,6 +975,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string DictionaryCode { get; set; } = string.Empty;
 
 
+		/// <summary>
+		/// Parent字典code
+		/// </summary>
+		public string ParentDictionaryCode { get; set; } = string.Empty;
+
+
 		/// <summary>
 		/// 关联ID
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index b04928dd7..0f8cd5534 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -171,6 +171,8 @@ namespace IRaCIS.Core.Application.Service
             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.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));
 
 
@@ -183,6 +185,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingQuestionTrial, ReadingQuestionTrialView>()
                  .ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionTrial == null ? string.Empty : s.ParentReadingQuestionTrial.QuestionName))
             .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));
             #endregion
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 6482abf16..5993f13d4 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -526,6 +526,17 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public string ParentQuestionName { get; set; }
 
+        /// <summary>
+        /// Parent字典code
+        /// </summary>
+        public string ParentDictionaryCode { get; set; } = string.Empty;
+
+        /// <summary>
+		/// Parent问题类型
+		/// </summary>
+		public TableQuestionType? ParentQuestionGenre { get; set; }
+
+
         public int? RelevanceShowOrder { get; set; }
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 0698a6a55..34e45f8fc 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -245,6 +245,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ReadingQuestionTrial, TrialReadQuestion>()
        .ForMember(t => t.PageName, u => u.MapFrom(c => c.ReadingCriterionPage.PageName))
+          .ForMember(d => d.ParentQuestionGenre, u => u.MapFrom(s => s.ParentReadingQuestionTrial.QuestionGenre))
+             .ForMember(d => d.ParentDictionaryCode, u => u.MapFrom(s => s.ParentReadingQuestionTrial.DictionaryCode))
         .ForMember(t => t.ParentQuestionName, u => u.MapFrom(c => c.ParentReadingQuestionTrial.QuestionName))
           .ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder))
               .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder));