diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 92893e0ca..e0b091502 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -1766,7 +1766,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid QuestionId { get; set; }
 
-        public string Type { get; set; }
+        public string Type { get; set; } = string.Empty;
+
+        public List<string> TypeList { get; set; } = new List<string>();
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 78a91e998..fa89dc852 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -150,7 +150,10 @@ namespace IRaCIS.Core.Application.Service
             var result = await _readingTableQuestionTrialRepository
 
          .Where(x => x.ReadingQuestionId == inDto.QuestionId)
-           .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(inDto.TypeList.Count() > 0, x => inDto.TypeList.Contains(x.Type))
+
+
          .OrderBy(x => x.ShowOrder)
           .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
           {
@@ -172,7 +175,8 @@ namespace IRaCIS.Core.Application.Service
             var result = await _readingTableQuestionSystemRepository
 
          .Where(x => x.ReadingQuestionId == inDto.QuestionId)
-           .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(inDto.TypeList.Count() > 0, x => inDto.TypeList.Contains(x.Type))
          .OrderBy(x => x.ShowOrder)
           .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
           {
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 1e88652d7..c906330fd 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -232,9 +232,11 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<ReadingTableQuestionSystem, GetCalculateTableQuestionsOutDto>()
+                    .ForMember(d => d.QuestionId, u => u.MapFrom(s => s.Id))
                 .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
 
             CreateMap<ReadingTableQuestionTrial, GetCalculateTableQuestionsOutDto>()
+                 .ForMember(d => d.QuestionId, u => u.MapFrom(s => s.Id))
              .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
 
 
@@ -265,6 +267,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ReadingQuestionSystem, ReadingQuestionTrial>()
                 .ForMember(d => d.CreateUser, u => u.Ignore())
+                 .ForMember(d => d.ReadingTableQuestionTrialList, u => u.Ignore())
                 .ForMember(d => d.ReadingQuestionSystemId, u => u.MapFrom(s => s.Id));
 
             CreateMap<ReadingTableAnswerRowInfo, TableAnsweRowInfo>()