diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
index b77f09fe..6bc64367 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
@@ -660,7 +660,10 @@ namespace IRaCIS.Core.Application.Service
 			var targetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefault();
 			var noTargetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NoTargetLesion).Select(x => x.Answer).FirstOrDefault();
 			var newLesions = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesions).Select(x => x.Answer).FirstOrDefault();
-			var result = await _tumorAssessmentRepository.Where(x => x.TargetLesion.GetEnumInt() == targetLesion && x.NonTargetLesions.GetEnumInt() == noTargetLesion && x.NewLesion.GetEnumInt() == newLesions).Select(x => x.OverallEfficacy).ToListAsync();
+			var result = await _tumorAssessmentRepository.Where(x => 
+			x.TargetLesion == (TargetAssessment)int.Parse(targetLesion?? TargetAssessment.NA.GetEnumInt()) && 
+			x.NonTargetLesions == (NoTargetAssessment)int.Parse(noTargetLesion?? NoTargetAssessment.NA.GetEnumInt()) && 
+			x.NewLesion == (NewLesionAssessment)int.Parse(newLesions?? NewLesionAssessment.NA.GetEnumInt())).Select(x => x.OverallEfficacy).ToListAsync();
 
 			return result.Count == 0 ? OverallAssessment.NA.GetEnumInt() : result[0].GetEnumInt();
 		}