diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 3ee8fae89..99585941f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -1069,6 +1069,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public CustomCalculateMark? CustomCalculateMark { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } + + /// + /// 自定义单位 + /// + public string CustomUnit { get; set; } = string.Empty; + public List CalculateQuestionList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 822ca656b..b39163423 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -497,8 +497,11 @@ namespace IRaCIS.Application.Services .Select(x => new CalculateRelationDto() { QuestionId = x.Id, - CustomCalculateMark=x.CustomCalculateMark, - CalculateQuestionList = x.CalculateQuestionList + CustomCalculateMark = x.CustomCalculateMark, + CalculateQuestionList = x.CalculateQuestionList, + ValueType = x.ValueType, + Unit = x.Unit, + CustomUnit = x.CustomUnit, }).ToListAsync(); } @@ -509,7 +512,10 @@ namespace IRaCIS.Application.Services { QuestionId = x.Id, CustomCalculateMark = x.CustomCalculateMark, - CalculateQuestionList = x.CalculateQuestionList + CalculateQuestionList = x.CalculateQuestionList, + ValueType = x.ValueType, + Unit = x.Unit, + CustomUnit = x.CustomUnit, }).ToListAsync(); }