Uat_Study
he 2022-10-10 13:42:19 +08:00
parent 4c2827401b
commit 2fd1abf54d
2 changed files with 30 additions and 7 deletions

View File

@ -84,6 +84,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string OrderMark { get; set; } = string.Empty; public string OrderMark { get; set; } = string.Empty;
/// <summary>
/// 数值类型
/// </summary>
public ValueOfType? ValueType { get; set; }
/// <summary>
/// 单位
/// </summary>
public ValueUnit? Unit { get; set; }
public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>(); public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>();
public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>(); public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>();
@ -1698,13 +1708,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 数值类型
/// </summary>
public ValueOfType? ValueType { get; set; }
/// <summary>
/// 单位
/// </summary>
public ValueUnit? Unit { get; set; }
} }

View File

@ -542,6 +542,8 @@ namespace IRaCIS.Application.Services
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
ValueType=x.ValueType,
Unit=x.Unit,
}).ToList(); }).ToList();
@ -562,7 +564,8 @@ namespace IRaCIS.Application.Services
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
OrderMark = x.OrderMark, OrderMark = x.OrderMark,
ValueType = x.ValueType,
Unit = x.Unit,
}).ToList(); }).ToList();
@ -611,7 +614,8 @@ namespace IRaCIS.Application.Services
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
RowIndex = row.RowIndex, RowIndex = row.RowIndex,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
ValueType = x.ValueType,
Unit = x.Unit,
}).ToList(); }).ToList();
@ -816,7 +820,8 @@ namespace IRaCIS.Application.Services
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
RelationQuestions = new List<GetTrialReadingQuestionOutDto>(), RelationQuestions = new List<GetTrialReadingQuestionOutDto>(),
Remark = x.Remark, Remark = x.Remark,
ValueType=x.ValueType,
Unit=x.Unit,
}).ToList(); }).ToList();
}); });
var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList(); var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList();