Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

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
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        public async Task<decimal> GetSuvMax(ReadingCalculateDto inDto)
+        public async Task<decimal?> 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();