diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 44f0b2173..440d2d13f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -51,8 +51,11 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<TrialQuestionVisitJudgeRuleItemDto>> GetTrialQuestionVisitJudgeRule(GetTrialQuestionVisitJudgeRuleInDto inDto)
         {
             var questionList = await _readingQuestionTrialRepository
-                .Where(x=>!x.ExcludeShowVisitList.Contains(inDto.VisitNum))
                 .Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId && x.IsJudgeQuestion)
+                .Where(x => x.LimitShow == LimitShow.AllShow
+                    || (x.LimitShow == LimitShow.BaseLineShow && inDto.VisitNum == 0)
+                    || (x.LimitShow == LimitShow.FollowShow && inDto.VisitNum != 0)
+                    || (x.LimitShow == LimitShow.ExcludeSomeVisits && !x.ExcludeShowVisitList.Contains(inDto.VisitNum)))
                 .WhereIf(inDto.ReadingQuestionId != null, x => x.Id == inDto.ReadingQuestionId)
                 .OrderBy(x => x.ShowOrder)
                 .Select(x => new TrialQuestionVisitJudgeRuleItemDto