IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -486,23 +486,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     Evaluation = new List<List<EvaluationValue>>() { }
                 };
 
-                var baseLineAnswerType= QuestionType.ExistDisease;
-
                 var visitAnswerType = QuestionType.Tumor;
-                switch (criterion.CriterionType)
+                if (criterion.CriterionType == CriterionType.PCWG3)
                 {
-                    case CriterionType.PCWG3:
+                    visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
-                        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() { 
@@ -511,7 +499,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var r1baseLine= r1.TaskQuestions
                              .SelectMany(x => x.Childrens)
-                             .Where(x => x.QuestionType == baseLineAnswerType)
+                             .Where(x => x.QuestionType == QuestionType.ExistDisease)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                              {
                                  DictionaryCode = x.DictionaryCode,
@@ -542,7 +530,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     var r2baseLine = r2.TaskQuestions
                           .SelectMany(x => x.Childrens)
-                          .Where(x => x.QuestionType == baseLineAnswerType)
+                          .Where(x => x.QuestionType == QuestionType.ExistDisease)
                           .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                           {
                               DictionaryCode = x.DictionaryCode,