diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index f6d0e06d5..8a3daa738 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -63,7 +63,7 @@ namespace IRaCIS.Application.Services IRepository readingCriterionPageRepository, IRepository readingJudgeInfoRepository, IRepository readModuleRepository, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository tumorAssessmentRepository, IRepository readingTableAnswerRowInfoRepository, IRepository readingTableQuestionSystemRepository, @@ -128,7 +128,7 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task<(List, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto) { - var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync(); if (taskInfo.TaskState != TaskState.Effect) { @@ -158,7 +158,10 @@ namespace IRaCIS.Application.Services }).OrderBy(x => x.VisitTaskNum).ToListAsync(); - + if (!taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder) + { + result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList(); + } return (result, new {