From d5d4d4b539f4280416e79d1d97fed47518d481f0 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 3 Nov 2022 17:28:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 8 ++++++++ .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 4 ++++ IRaCIS.Core.Application/Service/Reading/_MapConfig.cs | 1 + 3 files changed, 13 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index fbfe97dc..59c6f1b4 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -428,6 +428,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string OrderMark { get; set; } = string.Empty; + + public string OrderMarkName { get; set; } = string.Empty; + public Guid RowId { get; set; } /// @@ -469,6 +472,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string RowIndex { get; set; } + /// + /// RowIndex + /// + public decimal RowIndexNum { get; set; } + /// /// 是Dicom阅片 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 9168bf15..3c6bffe8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -405,7 +405,11 @@ namespace IRaCIS.Application.Services .WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex) .ToListAsync(); + result.ForEach(x => + { + x.OrderMarkName = x.OrderMark + x.RowIndexNum.GetLesionMark(); + }); return result; } diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 9fde3800..16660ef7 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -86,6 +86,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder)) .ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark)) .ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString())) + .ForMember(d => d.RowIndexNum, u => u.MapFrom(s => s.RowIndex)) .ForMember(d => d.RowId, u => u.MapFrom(s => s.Id));