diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
index 14377871c..a1988b83e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
@@ -171,6 +171,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string QuestionEnName { get; set; } = string.Empty;
+ ///
+ /// 分组名称
+ ///
+ public string? GroupName { get; set; } = string.Empty;
+
+ ///
+ /// 分组英文名称
+ ///
+ public string? GroupEnName { get; set; } = string.Empty;
+
///
/// 临床问题类型(分组,单选。)
///
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 1f39bf5a9..1919f105d 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -18,10 +18,15 @@ namespace IRaCIS.Core.Application.Service
var isEn_Us=false;
#region 临床问题
- CreateMap();
+ CreateMap()
+ .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName))
+ .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName));
+
CreateMap();
- CreateMap();
+ CreateMap()
+ .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName))
+ .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName));
CreateMap();
CreateMap();
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
index 0905c294e..6be623736 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
@@ -143,7 +143,14 @@ namespace IRaCIS.Core.Domain.Models
///
public string CalculateQuestions { get; set; } = "[]";
- [NotMapped]
+ ///
+ /// 分组
+ ///
+ [JsonIgnore]
+ [ForeignKey("GroupId")]
+ public SystemClinicalQuestion GroupQuestin { get; set; }
+
+ [NotMapped]
public List CalculateQuestionList
{
get
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
index 931484b8c..e57916f05 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
@@ -133,6 +133,13 @@ namespace IRaCIS.Core.Domain.Models
///
public ClinicalCalculateMark? CustomCalculateMark { get; set; }
+ ///
+ /// 分组
+ ///
+ [JsonIgnore]
+ [ForeignKey("GroupId")]
+ public TrialClinicalQuestion GroupQuestin { get; set; }
+
///
/// 自定义计算问题
///