diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index e029b5a19..440d36e51 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -1324,7 +1324,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
                 && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
                 && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
-                &&x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
+                && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId
+                && x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
                 && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
                 .Select(x => new VisitTaskAnswerInfo
                 {
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index d71560508..739a9e5c8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -1325,6 +1325,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
                 && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
                 &&x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
+                && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId
                 && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
                 .Select(x => new VisitTaskAnswerInfo
                 {
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index cd48d876e..1c135a7e9 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -1324,7 +1324,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
                 && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
                 && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
-                &&x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
+                && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId
+                && x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
                 && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
                 .Select(x => new VisitTaskAnswerInfo
                 {