diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index e6b756e08..fd8ea8d93 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -524,7 +524,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//SUVmax
- new ReadingCalculateData (){QuestionType=QuestionType.SUVmax,GetDecimalFun=GetSuvMax},
+ new ReadingCalculateData (){QuestionType=QuestionType.SUVmax,GetDecimalNullFun=GetSuvMax},
// SUVmax所在病灶
new ReadingCalculateData (){QuestionType=QuestionType.SUVmaxLesion,GetStringFun=GetSuvMaxFocus},
@@ -2248,8 +2248,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
///
///
- public async Task GetSuvMax(ReadingCalculateDto inDto)
+ public async Task GetSuvMax(ReadingCalculateDto inDto)
{
+ if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+ {
+ return null;
+ }
var rowInfo = inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).ToList();
var tableQuestions = rowInfo.SelectMany(x => x.TableQuestionList).ToList();