diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 03c7489f4..d8f3cfb71 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -171,6 +171,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public decimal VisitNum { get; set; } + public bool IsReadingShowSubjectInfo { get; set; } = false; + + public bool IsReadingShowPreviousResults { get; set; } = false; + } public class GetReadingImgInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 9ef17a5ad..9415baf81 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -338,6 +338,24 @@ namespace IRaCIS.Application.Services FirstReadingTime = DateTime.Now, }); await _visitTaskRepository.SaveChangesAsync(); + + var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync(); + + task.SubjectCode = visitTaskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : visitTaskInfo.BlindSubjectCode; + + + var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).Select(x => new + { + x.IsReadingShowPreviousResults, + x.IsReadingShowSubjectInfo, + x.ClinicalInformationTransmissionEnum, + }).FirstOrDefaultAsync(); + + task.IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults; + task.IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo; + + + return task; } #endregion @@ -887,8 +905,6 @@ namespace IRaCIS.Application.Services break; } - - return judgeInfo; }