XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2023-01-03 15:18:40 +08:00
parent 932cb89a44
commit dcbb9fa391
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

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

4
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -171,6 +171,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingQuestionSystem, ReadingQuestionSystemView>() CreateMap<ReadingQuestionSystem, ReadingQuestionSystemView>()
.ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionSystem==null?string.Empty: s.ParentReadingQuestionSystem.QuestionName)) .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.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.RelevanceShowOrder, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.ShowOrder));
@ -183,6 +185,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingQuestionTrial, ReadingQuestionTrialView>() CreateMap<ReadingQuestionTrial, ReadingQuestionTrialView>()
.ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionTrial == null ? string.Empty : s.ParentReadingQuestionTrial.QuestionName)) .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.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));
#endregion #endregion

11
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -526,6 +526,17 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public string ParentQuestionName { get; set; } 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; } public int? RelevanceShowOrder { get; set; }

2
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -245,6 +245,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingQuestionTrial, TrialReadQuestion>() CreateMap<ReadingQuestionTrial, TrialReadQuestion>()
.ForMember(t => t.PageName, u => u.MapFrom(c => c.ReadingCriterionPage.PageName)) .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.ParentQuestionName, u => u.MapFrom(c => c.ParentReadingQuestionTrial.QuestionName))
.ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder)) .ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder))
.ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder)); .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder));