Merge branch '中心影像_Test环境' of http://192.168.1.2:8033/IRaCIS_Core_Api into 中心影像_Test环境

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2931,6 +2931,16 @@
             问题英文名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.GroupName">
+            <summary>
+            分组名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.GroupEnName">
+            <summary>
+            分组英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.ClinicalQuestionType">
             <summary>
             临床问题类型(分组，单选。)

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -327,7 +327,7 @@ namespace IRaCIS.Core.Application.Service
             var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == formInfo.ClinicalDataTrialSetId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).ToListAsync();
 
-
+            questions.ForEach(x => x.CreateTime = formInfo.CreateTime);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
 
             result.ForEach(x =>

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs

@@ -123,7 +123,7 @@ namespace IRaCIS.Core.Application.Service
             var tableQuestions= await _systemClinicalTableQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
-
+            questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
 
             result.ForEach(x =>
@@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Service
             var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
-
+            questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).ToList();
 
             result.ForEach(x =>

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs

@@ -111,6 +111,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string Answer { get; set; } = string.Empty;
 
+        public DateTime? CreateTime { get; set; }
+
         /// <summary>
         /// 子问题
         /// </summary>
@@ -169,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>

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>();

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

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>