From c8a67784391946cdd1f322a24d230da19022b794 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 22 Sep 2022 14:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ReadingCalculateService.cs               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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();
 		}