diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs index 8a662bd95..6331b4015 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs @@ -123,9 +123,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate public async Task AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto) { var service = await this.GetService(inDto.VisitTaskId); - if (service != null) + var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + if (service != null&& visitTaskInfo.SourceSubjectVisitId!=null) { - var readingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x=>x.ReadingTaskState).FirstNotNullAsync(); + var readingTaskState = visitTaskInfo.ReadingTaskState; var result = new AddTaskLesionAnswerFromLastTaskOutDto(); if (readingTaskState == ReadingTaskState.WaitReading)