diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index e9ac5155d..b1cb82bec 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -704,7 +704,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var visitTaskId = inDto.VisitTaskId;
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
 
             var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
 
@@ -790,13 +790,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             TableQuestionId = x.TableQuestionId,
                             TrialId = x.TrialId,
                             VisitTaskId = visitTaskId,
-                        });
+                        }).ToList();
 
 
 
 
                         var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
-
+                        await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                         await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                         await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
                         await _readingTableQuestionAnswerRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 86294b8f0..1102a37e8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -1245,6 +1245,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList();
 
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
+
                     foreach (var item in addList)
                     {
                         await _readingTableAnswerRowInfoRepository.AddAsync(item);
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
index 80e2f74ee..f4e00df13 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
@@ -1244,7 +1244,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList();
-
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                     foreach (var item in addList)
                     {
                         await _readingTableAnswerRowInfoRepository.AddAsync(item);
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 77e516d4c..5217b83ae 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -591,13 +591,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         TableQuestionId = x.TableQuestionId,
                         TrialId = x.TrialId,
                         VisitTaskId = visitTaskId,
-                    });
+                    }).ToList();
 
 
 
 
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
-
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 3b3da96ad..8017ddb37 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -488,7 +488,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
-
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 66379bbe9..ae4f7325f 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -601,7 +601,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
 
 
-                   await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index cb3934cc9..1789cbf3c 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -594,13 +594,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         TableQuestionId = x.TableQuestionId,
                         TrialId = x.TrialId,
                         VisitTaskId = visitTaskId,
-                    });
+                    }).ToList();
 
 
 
 
                     var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
-
+                    await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index b11cd4f57..8701ab1f7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -157,6 +157,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var visitTaskId = inDto.VisitTaskId;
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+            var trialReadingCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstNotNullAsync();
             var isReadingTaskViewInOrder = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
             var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
 
@@ -298,7 +299,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 }
             }
-
+            if(trialReadingCriterion.IsOncologyReading)
+            {
+                await _generalCalculateService.CopyHistoryAnswer(taskinfo, addRowList, addTableQuestionAnswerList);
+            }
+           
             await _readingTableAnswerRowInfoRepository.AddRangeAsync(addRowList);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(addTableQuestionAnswerList);
             await _readingTableQuestionAnswerRepository.SaveChangesAsync();