diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 208b80a1d..4a8500658 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -2452,9 +2452,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid ReadingQuestionId { get; set; }
         public string QuestionName { get; set; } = string.Empty;
+        public string Type { get; set; } = string.Empty;
+        public string TypeValue { get; set; } = string.Empty;
         public int ShowOrder { get; set; }
         public string R1Answer { get; set; } = string.Empty;
         public string R2Answer { get; set; } = string.Empty;
+        public TableQuestionType? QuestionGenre { get; set; }
+        public string DictionaryCode { get; set; } = string.Empty;
+        public ValueUnit? Unit { get; set; }
+        public string? CustomUnit { get; set; }
+        public ValueOfType? ValueType { get; set; }
+        public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
     }
 
     public class GetJudgeFormInDto
@@ -2476,6 +2484,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string TypeValue { get; set; } = string.Empty;
         public int ShowOrder { get; set; }
         public string Answer { get; set; } = string.Empty;
+        public TableQuestionType? QuestionGenre { get; set; }
+        public string DictionaryCode { get; set; } = string.Empty;
+        public ValueUnit? Unit { get; set; }
+        public string? CustomUnit { get; set; }
+        public ValueOfType? ValueType { get; set; }
+        public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
     }
 
     public class SetJudgeFormInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index 805aea61b..4d0feeaa4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -125,7 +125,14 @@ namespace IRaCIS.Core.Application.Service
                 {
                     ReadingQuestionId = x.Id,
                     QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+                    Type = x.Type,
+                    TypeValue = x.TypeValue,
                     ShowOrder = x.ShowOrder,
+                    QuestionGenre = x.QuestionGenre,
+                    DictionaryCode = x.DictionaryCode,
+                    Unit = x.Unit,
+                    CustomUnit = x.CustomUnit,
+                    ValueType = x.ValueType,
                 })
                 .ToList();
 
@@ -174,6 +181,11 @@ namespace IRaCIS.Core.Application.Service
                     TypeValue = x.TypeValue,
                     ShowOrder = x.ShowOrder,
                     Answer = answers.FirstOrDefault(answer => answer.ReadingQuestionTrialId == x.Id)?.Answer ?? string.Empty,
+                    QuestionGenre = x.QuestionGenre,
+                    DictionaryCode = x.DictionaryCode,
+                    Unit = x.Unit,
+                    CustomUnit = x.CustomUnit,
+                    ValueType = x.ValueType,
                 }).ToList(),
             };
         }