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
///
public TableQuestionType? QuestionGenre { get; set; }
+ ///
+ /// Parent问题类型
+ ///
+ public TableQuestionType? ParentQuestionGenre { get; set; }
+
+
///
/// 字典code
///
public string DictionaryCode { get; set; } = string.Empty;
+ ///
+ /// Parent字典code
+ ///
+ public string ParentDictionaryCode { get; set; } = string.Empty;
+
///
/// 系统标准Id
@@ -941,6 +952,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public TableQuestionType? QuestionGenre { get; set; }
+ ///
+ /// Parent问题类型
+ ///
+ public TableQuestionType? ParentQuestionGenre { get; set; }
+
///
/// 全局阅片显示类型
@@ -959,6 +975,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string DictionaryCode { get; set; } = string.Empty;
+ ///
+ /// Parent字典code
+ ///
+ public string ParentDictionaryCode { get; set; } = string.Empty;
+
+
///
/// 关联ID
///
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()
.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()
.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
///
public string ParentQuestionName { get; set; }
+ ///
+ /// Parent字典code
+ ///
+ public string ParentDictionaryCode { get; set; } = string.Empty;
+
+ ///
+ /// Parent问题类型
+ ///
+ 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()
.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));