diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index d735a845f..4d9b4fd77 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -859,6 +859,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class ReadingQuestionCriterionSystemViewInDto : PageInput
     {
         public string CriterionName { get; set; } = String.Empty;
+
+        public bool? IsCompleteConfig { get; set; }
+        public bool? IsEnable { get; set; }
+        public CriterionGroup? CriterionGroup { get; set; }
+        public CriterionType? CriterionType { get; set; }
+
+     
     }
 
     public class CriterionList
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
index 49e6d333e..09aac24a3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
@@ -230,6 +230,10 @@ namespace IRaCIS.Core.Application.Service.RC
             //await AddSystemQuestionCriterion();
             var query = _readingQuestionCriterionSystemRepository.AsQueryable()
                  .WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
+                 .WhereIf(inDto.IsEnable!=null, x => x.IsEnable== inDto.IsEnable)
+                 .WhereIf(inDto.IsCompleteConfig != null, x => x.IsCompleteConfig == inDto.IsCompleteConfig)
+                 .WhereIf(inDto.CriterionGroup != null, x => x.CriterionGroup == inDto.CriterionGroup)
+                 .WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
                  .ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(inDto, nameof(ReadingQuestionCriterionSystemView.ShowOrder));