diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs index ac68da36..6dcd00dd 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs @@ -162,6 +162,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// public async Task GetReportVerify(GetReportVerifyInDto inDto) { + var service = await this.GetService(inDto.VisitTaskId); if (service != null) @@ -186,11 +187,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (service != null) { - await service.CalculateTask(new CalculateTaskInDto() - { - VisitTaskId = inDto.VisitTaskId - }); + var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + if (taskInfo.SignTime == null) + { + await service.CalculateTask(new CalculateTaskInDto() + { + + VisitTaskId = inDto.VisitTaskId + }); + } + return await service.GetReadingReportEvaluation(inDto); } else