diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index 799f3126f..45ef36335 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -18,7 +18,8 @@ namespace IRaCIS.Application.Services
         public IRepository<SubjectVisit> _subjectVisitRepository;
 
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-        private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
+		private readonly IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository;
+		private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
         private readonly IRepository<PreviousPDF> _previousPDFRepository;
 		private readonly IRepository<Dictionary> _dictionaryRepository;
 		private readonly IRepository<Trial> _trialRepository;
@@ -29,7 +30,8 @@ namespace IRaCIS.Application.Services
         public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
               IClinicalQuestionService iClinicalQuestionService,
             IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
-            IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
+				IRepository<ReadingQuestionCriterionTrial> iReadingQuestionCriterionTrialRepository,
+			IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
             IRepository<PreviousPDF> previousPDFRepository,
 			  IRepository<Dictionary> dictionaryRepository,
               IRepository<TrialClinicalQuestion> trialClinicalQuestionRepository,
@@ -45,7 +47,8 @@ namespace IRaCIS.Application.Services
             _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
             _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
             _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
-            _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
+			this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository;
+			_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
             this._previousPDFRepository = previousPDFRepository;
 			this._dictionaryRepository = dictionaryRepository;
 			this._trialRepository = trialRepository;
@@ -271,11 +274,15 @@ namespace IRaCIS.Application.Services
         public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto)
         {
             await this.AddTrialClinicalDataTrialSet(inDto.TrialId);
-
-            
-            var trialClinicalDataList = await _clinicalDataTrialSetRepository.AsQueryable()
+            List<int> criterionTypes = new List<int>();
+            if (inDto.CriterionIds != null)
+            {
+                criterionTypes =( await _iReadingQuestionCriterionTrialRepository.Where(x => inDto.CriterionIds.Contains(x.Id)).Select(x => x.CriterionType).ToListAsync())
+                    .Select(x=>(int)x).ToList();
+			}
+			var trialClinicalDataList = await _clinicalDataTrialSetRepository.AsQueryable()
                .Where(x => x.TrialId == inDto.TrialId)
-               .WhereIf(inDto.CriterionTypes!=null,x=>x.IsConfirm||x.SystemClinicalDataSetId==null||inDto.CriterionTypes.Intersect(x.CriterionEnumList).Count()>0)
+               .WhereIf(inDto.CriterionIds != null,x=>x.IsConfirm||x.SystemClinicalDataSetId==null|| criterionTypes.Intersect(x.CriterionEnumList).Count()>0)
                .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
                .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
index 4be0b57d8..5f67adb1f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
@@ -312,7 +312,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ClinicalUploadType? ClinicalUploadType { get; set; }
 
-        public List<int>? CriterionTypes { get; set; }
+        public List<Guid>? CriterionIds { get; set; }
     }