This commit is contained in:
he
2022-09-21 14:14:32 +08:00
parent b313a89dd6
commit 60a9ed0c31
5 changed files with 71 additions and 4 deletions
@@ -390,7 +390,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// RowIndex
/// </summary>
public decimal RowIndex { get; set; }
public string RowIndex { get; set; }
/// <summary>
/// MeasureData
@@ -484,7 +484,7 @@ namespace IRaCIS.Application.Services
question.Childrens = rowIndexs.Select(x => new ReadingReportDto()
{
QuestionName = question.OrderMark + x.ToString().PadLeft(2, '0'),
QuestionName = question.OrderMark + x.GetLesionMark(),
RowIndex = x,
}).ToList();
@@ -549,13 +549,16 @@ namespace IRaCIS.Application.Services
/// (QuestionId) 可为空
/// </remarks>
/// <returns></returns>
[HttpPost]
public async Task<List<GetTableAnswerRowInfoOutDto>> GetTableAnswerRowInfoList(GetTableAnswerRowInfoInDto inDto)
{
await this.AddBaseLineAnswerToOtherTask(inDto.VisitTaskId);
return await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
var result= await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
.WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId)
.ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex)
.ToListAsync();
return result;
}
/// <summary>
@@ -63,7 +63,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingTableAnswerRowInfo, GetTableAnswerRowInfoOutDto>()
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder));
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder))
.ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString()));