diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index a844d5e4e..66b5b0b92 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -367,13 +367,13 @@ namespace IRaCIS.Application.Services /// public async Task> GetSubjectReadVisitList(GetSubjectReadVisitsInDto inDto) { - var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.SubmitState != SubmitStateEnum.None); + var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null); var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync(); var readModulequery = _readModuleRepository.AsQueryable(); - return await visitQuery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum) + var resultlist= await visitQuery.WhereIf(finalVisitNum != null&& finalVisitNum!=0, x => x.VisitNum < finalVisitNum) .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum) .Select(x => new GetSubjectReadVisitsOutDto() { @@ -381,6 +381,8 @@ namespace IRaCIS.Application.Services VisitName = x.VisitName, VisitNum = x.VisitNum, }).ToListAsync(); + + return resultlist; } ///