diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index ab97ea5c3..320784ee5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -137,7 +137,7 @@ namespace IRaCIS.Application.Services
 
             result.TaskList.ForEach(x =>
             {
-                x.AfterQuestionList = x.BeforeQuestionList.GroupJoin(
+                x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin(
                     globalReadingQuestion
                       , l => new { a = l.QuestionId, b = x.VisitTaskId }
                       , r => new { a = r.QuestionId, b = r.TaskId }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 791686ded..9684c1abc 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -718,6 +718,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<string> GetSiteVisitForTumorEvaluation(ReadingCalculateDto inDto)
         {
+            if(inDto.IsBaseLine)
+            {
+                return VisitTumorEvaluation.NA.GetEnumInt();
+            }
            var isPD= await ChangeLastTaskSiteVisitForTumorEvaluation(inDto);
             var newLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
             var baseLineLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 60f7f88f2..93f35a56d 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -1046,7 +1046,12 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// 非PD
         /// </summary>
-        NoPD = 4
+        NoPD = 4,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 5
     }
 
     /// <summary>