diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 65660d199..392d3cfe6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public LesionType? LesionType { get; set; }
 
-        public Guid? CriterionId { get; set; }
+        public Guid SystemCriterionId { get; set; }
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index 27b53fab8..be17dc58f 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -91,7 +91,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery)
         {
             var organInfoQueryable = _organInfoRepository
-         
+               .Where(x=>x.SystemCriterionId==inQuery.SystemCriterionId)
                .WhereIf(inQuery.LesionType != null, x => x.LesionType == inQuery.LesionType)
             .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
             return await organInfoQueryable.ToListAsync();