diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index a120a38f2..f96cbb832 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -486,11 +486,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     Evaluation = new List<List<EvaluationValue>>() { }
                 };
 
+                var baseLineAnswerType= QuestionType.ExistDisease;
+
                 var visitAnswerType = QuestionType.Tumor;
-                if (criterion.CriterionType == CriterionType.PCWG3)
+                switch (criterion.CriterionType)
                 {
-                    visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
+                    case CriterionType.PCWG3:
+                        baseLineAnswerType= QuestionType.SiteVisitForTumorEvaluation;
+                        visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
+                        break;
+                    case CriterionType.Lugano2014WithoutPET:
+                        visitAnswerType = QuestionType.CTandMRI;
+                        break;
+                    case CriterionType.Lugano2014:
+                        visitAnswerType = QuestionType.ImgOncology;
+                        break;
                 }
+                
 
 
                 result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { 
@@ -499,7 +511,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var r1baseLine= r1.TaskQuestions
                              .SelectMany(x => x.Childrens)
-                             .Where(x => x.QuestionType == QuestionType.ExistDisease)
+                             .Where(x => x.QuestionType == baseLineAnswerType)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                              {
                                  DictionaryCode = x.DictionaryCode,
@@ -530,7 +542,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     var r2baseLine = r2.TaskQuestions
                           .SelectMany(x => x.Childrens)
-                          .Where(x => x.QuestionType == QuestionType.ExistDisease)
+                          .Where(x => x.QuestionType == baseLineAnswerType)
                           .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                           {
                               DictionaryCode = x.DictionaryCode,