From 36cb770a866c3a1bad9173aa9abd77134b802ceb Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 26 Jul 2023 11:01:25 +0800
Subject: [PATCH] =?UTF-8?q?S-97=20=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ClinicalQuestionDto.cs         | 10 ++++++++++
 IRaCIS.Core.Application/Service/Reading/_MapConfig.cs  |  9 +++++++--
 .../Reading/ClinicalQuestion/SystemClinicalQuestion.cs |  9 ++++++++-
 .../Reading/ClinicalQuestion/TrialClinicalQuestion.cs  |  7 +++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

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
         /// </summary>
         public string QuestionEnName { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 分组名称
+        /// </summary>
+        public string? GroupName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分组英文名称
+        /// </summary>
+        public string? GroupEnName { 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 ebd59056e..dca2943b3 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<TrialClinicalQuestion, TrialClinicalQuestionDto>();
+            CreateMap<TrialClinicalQuestion, TrialClinicalQuestionDto>()
+                   .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName))
+                   .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName));
+
             CreateMap<TrialClinicalQuestionDto, TrialClinicalQuestion>();
 
-            CreateMap<SystemClinicalQuestion, SystemClinicalQuestionDto>();
+            CreateMap<SystemClinicalQuestion, SystemClinicalQuestionDto>()
+               .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName))
+                   .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName));
             CreateMap<SystemClinicalQuestionDto, SystemClinicalQuestion>();
 
             CreateMap<SystemClinicalTableQuestion, SystemClinicalTableQuestionDto>();
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
 		/// </summary>
 		public string CalculateQuestions { get; set; } = "[]";
 
-		[NotMapped]
+        /// <summary>
+        /// 分组
+        /// </summary>
+        [JsonIgnore]
+        [ForeignKey("GroupId")]
+        public SystemClinicalQuestion GroupQuestin { get; set; }
+
+        [NotMapped]
 		public List<CalculateInfo> 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
         /// </summary>
         public  ClinicalCalculateMark? CustomCalculateMark { get; set; }
 
+        /// <summary>
+        /// 分组
+        /// </summary>
+        [JsonIgnore]
+        [ForeignKey("GroupId")]
+        public TrialClinicalQuestion GroupQuestin { get; set; }
+
         /// <summary>
         /// 自定义计算问题
         /// </summary>