diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 62638a459..4f32563d8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1790,13 +1790,13 @@ namespace IRaCIS.Core.Application.Service
                 QuestionMark.IsLymph,
             };
 
-
+            List<QuestionMark?> needSetNa = new List<QuestionMark?>() { };
 
             switch (taskInfo.TrialReadingCriterion.CriterionType)
             {
                 case CriterionType.Lugano2014:
                 case CriterionType.Lugano2014WithoutPET:
-                    List<QuestionMark?> needSetNa = new List<QuestionMark?>()
+                    needSetNa = new List<QuestionMark?>()
                     {
                         QuestionMark.LowPPDAddPercent,
                         QuestionMark.NadirPPD,
@@ -1832,10 +1832,6 @@ namespace IRaCIS.Core.Application.Service
 
 
                     };
-                    tableAnswers.ForEach(x =>
-                    {
-                        x.Answer = needSetNa.Contains(x.QuestionMark) ? "NA" : x.Answer;
-                    });
                     break;
 
                 case CriterionType.mRECISTHCC:
@@ -1856,7 +1852,19 @@ namespace IRaCIS.Core.Application.Service
                 x.RowIndex = newRowIndex;
                 x.VisitTaskId = inDto.VisitTaskId;
                 x.RowId = rowAnswer.Id;
-                x.Answer = needSaveMark.Contains(x.QuestionMark) ? x.Answer : string.Empty;
+
+                var answer = string.Empty;
+                if (needSaveMark.Contains(x.QuestionMark))
+                {
+                    answer = x.Answer;
+                }
+
+                if (needSetNa.Contains(x.QuestionMark))
+                {
+                    answer = "NA";
+                }
+
+                x.Answer = answer;
             });
             await _readingTableAnswerRowInfoRepository.AddAsync(rowAnswer);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(_mapper.Map<List<ReadingTableQuestionAnswer>>(tableAnswers));