diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 14904b164..df47cde8d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -254,6 +254,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid TrialReadingCriterionId { get; set; } + public CriterionType CriterionType { get; set; } + } public class ChangeDicomReadingQuestionAnswerInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 2c5f88fdc..16faf5ec4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -115,9 +115,15 @@ namespace IRaCIS.Application.Services public async Task GetReadingTool(GetReadingToolInDto indto) { var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); - GetReadingToolOutDto result = new GetReadingToolOutDto(); - result.TrialReadingCriterionId = visitTaskInfo.TrialReadingCriterionId; - result.ReadingTool = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).Select(x => x.ReadingTool).FirstOrDefaultAsync(); + + var criterionTrialInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).FirstNotNullAsync(); + GetReadingToolOutDto result = new GetReadingToolOutDto() + { + TrialReadingCriterionId = visitTaskInfo.TrialReadingCriterionId, + ReadingTool = criterionTrialInfo.ReadingTool, + CriterionType = criterionTrialInfo.CriterionType, + }; + return result; }