diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4297d274b..ea09fd8d1 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2931,6 +2931,16 @@
问题英文名称
+
+
+ 分组名称
+
+
+
+
+ 分组英文名称
+
+
临床问题类型(分组,单选。)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index dce0aae40..9916cf064 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/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(_mapper.ConfigurationProvider).ToListAsync();
-
+ questions.ForEach(x => x.CreateTime = formInfo.CreateTime);
var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
result.ForEach(x =>
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
index f833223d8..2b1a77e52 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
+++ b/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(_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(_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 =>
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
index d5c21ac55..a1988b83e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
+++ b/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; }
+
///
/// 子问题
///
@@ -169,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 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();
+ 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; }
+
///
/// 自定义计算问题
///