diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index fbdf413c9..6046cf1d9 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -102,12 +102,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
                         if (inOrder)
                         {
 
-                            var notCheckPassedMinVisitNum = await _subjectVisitRepository.Where(t => t.SubjectId == subjectId && t.CheckState != CheckStateEnum.CVPassed).OrderBy(t => t.VisitNum).Select(t => t.VisitNum).FirstOrDefaultAsync();
-
-
-                            updateWhere = updateWhere.And(t => t.VisitTaskNum < notCheckPassedMinVisitNum);
+                            if (await _subjectVisitRepository.AnyAsync(t => t.SubjectId == subjectId && t.CheckState != CheckStateEnum.CVPassed))
+                            {
+                                var notCheckPassedMinVisitNum = await _subjectVisitRepository.Where(t => t.SubjectId == subjectId && t.CheckState != CheckStateEnum.CVPassed).OrderBy(t => t.VisitNum).Select(t => t.VisitNum).FirstOrDefaultAsync();
 
+                                updateWhere = updateWhere.And(t => t.VisitTaskNum < notCheckPassedMinVisitNum);
 
+                            }
 
                         }