diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 214dd1794..9753770bc 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1036,6 +1036,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? FirstAddTaskId { get; set; } public QuestionType? QuestionType { get; set; } + + public string? OrderMark { get; set; } = string.Empty; } public class GetReadingQuestionAndAnswerInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index fb265f5ac..6a9ded7f5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1568,27 +1568,15 @@ namespace IRaCIS.Application.Services }).ToListAsync(); await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId); - var datetime = DateTime.Now; - - - List markList = inDto.QuestionMarkInfoList.Select(x => new ReadingTaskQuestionMark - { - - Id = NewId.NextGuid(), - VisitTaskId = inDto.VisitTaskId, - InstanceId = x.InstanceId, - MarkTool = x.MarkTool, - NumberOfFrames = x.NumberOfFrames, - PicturePath = x.PicturePath, - MeasureData = x.MeasureData, - QuestionId = x.QuestionId, - SeriesId = x.SeriesId, - StudyId = x.StudyId, - CreateTime = datetime, - FirstAddTaskId= questionMarkList.Where(y=>y.QuestionId==x.QuestionId).Select(x=>x.FirstAddTaskId).FirstOrDefault() ?? inDto.VisitTaskId, - }).ToList(); + var markList = _mapper.Map, List>(inDto.QuestionMarkInfoList); + markList.ForEach(x => { + x.Id = NewId.NextGuid(); + x.VisitTaskId = inDto.VisitTaskId; + x.CreateTime = datetime; + x.FirstAddTaskId = questionMarkList.Where(y => y.QuestionId == x.QuestionId).Select(x => x.FirstAddTaskId).FirstOrDefault() ?? inDto.VisitTaskId; + }); await _readingTaskQuestionMarkRepository.AddRangeAsync(markList); await _readingTaskQuestionAnswerRepository.SaveChangesAsync(); return ResponseOutput.Ok(true); diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index c22f85460..297641640 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -81,6 +81,10 @@ namespace IRaCIS.Core.Domain.Models public QuestionType? QuestionType { get; set; } + + public string? OrderMark { get; set; } = string.Empty; + + }