diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
index 805eb24dd..46fee073f 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
@@ -218,7 +218,7 @@ namespace IRaCIS.Core.Application.Service
 
                     TrialReadingCriterionList = intoGroup.Trial.TrialReadingCriterionList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, IsOncologyReading = t.IsOncologyReading, IsArbitrationReading = t.IsArbitrationReading, IsGlobalReading = t.IsGlobalReading, ReadingInfoSignTime = t.ReadingInfoSignTime, ReadingType = t.ReadingType }).ToList(),
 
-                    DoctorCriterionStatusList = intoGroup.EnrollReadingCriteriaList.Select(t => new DoctorCriterionStatus()
+                    DoctorCriterionStatusList = intoGroup.EnrollReadingCriteriaList.Where(t=>t.TrialReadingCriterion.IsConfirm).Select(t => new DoctorCriterionStatus()
                     {
                         EnrollId = t.Id,
                         Id = t.Id,
@@ -228,9 +228,9 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-                    CriterionReadingCategoryList = intoGroup.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
+                    CriterionReadingCategoryList = intoGroup.EnrollReadingCategoryList.Where(t => t.TrialReadingCriterion.IsConfirm).Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
 
-                    CriterionFileList = doctor.CriterionFileList.Where(x => x.IsEnable && (x.TrialId == null || x.TrialId == trialId)).Select(x => new CriterionFile()
+                    CriterionFileList = doctor.CriterionFileList.Where(t => t.TrialReadingCriterion.IsConfirm).Where(x => x.IsEnable && (x.TrialId == null || x.TrialId == trialId)).Select(x => new CriterionFile()
                     {
                         CriterionType = x.CriterionType,
                         DoctorId = x.DoctorId,
@@ -242,7 +242,7 @@ namespace IRaCIS.Core.Application.Service
                         Id = x.Id
                     }).ToList(),
 
-                    ReadingTaskStateList = intoGroup.DoctorUser.VisitTaskList.Where(x => x.TaskState == TaskState.Effect && x.TrialId == trialId).Select(x => new DoctorUserTask()
+                    ReadingTaskStateList = intoGroup.DoctorUser.VisitTaskList.Where(t => t.TrialReadingCriterion.IsConfirm).Where(x => x.TaskState == TaskState.Effect && x.TrialId == trialId).Select(x => new DoctorUserTask()
                     {
                         ReadingTaskState = x.ReadingTaskState,
                         TrialReadingCriterionId = x.TrialReadingCriterionId,
diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
index 367c01f80..1a97a4294 100644
--- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
+++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
@@ -9,6 +9,10 @@ public class DoctorCriterionFile : BaseAddAuditEntity
     [JsonIgnore]
     [ForeignKey("DoctorId")]
     public Doctor Doctor { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("TrialReadingCriterionId")]
+    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
     #endregion
 
     public string CriterionName { get; set; } = null!;
diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
index 6b522518d..d75bfec12 100644
--- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
+++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
@@ -9,6 +9,10 @@ public class EnrollReadingCriterion : BaseAddAuditEntity
     [JsonIgnore]
     [ForeignKey("EnrollId")]
     public Enroll Enroll { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("TrialReadingCriterionId")]
+    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
     #endregion
     public Guid EnrollId { get; set; }
 
diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
index f8f958888..22a927f2b 100644
--- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
+++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
@@ -9,6 +9,10 @@ public class EnrollReadingCategory : BaseAddAuditEntity
     [JsonIgnore]
     [ForeignKey("EnrollId")]
     public Enroll Enroll { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("TrialReadingCriterionId")]
+    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
     #endregion
     public Guid EnrollId { get; set; }
     public ReadingCategory ReadingCategory { get; set; }