From fe90438f523ad5959f64f0487563c5c301a7ac68 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 13 Dec 2023 14:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingCalculateViewModel.cs     | 2 +-
 .../ReadingCalculate/General/GeneralCalculateService.cs  | 3 ++-
 .../Service/ReadingCalculate/LuganoCalculateService.cs   | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
index dab5f2a05..0d6644494 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
@@ -285,7 +285,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public decimal FristAddTaskNum { get; set; }
 
-
+        public string? OtherMeasureData { get; set; } = string.Empty;
         public string MeasureData { get; set; }
 
         public List<TableQuestionInfo> TableQuestionList { get; set; } = new List<TableQuestionInfo>();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 06b726a3a..7a173fc3d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -158,7 +158,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     RowIndex = x.RowIndex,
                     MeasureData = x.MeasureData,
-                    FristAddTaskNum=x.FristAddTaskNum,
+                    OtherMeasureData = x.OtherMeasureData,
+                    FristAddTaskNum =x.FristAddTaskNum,
                     TableQuestionList = tableQuestion.Where(y => y.QuestionId == item.QuestionId && y.RowId == x.Id).ToList(),
 
                 }).ToList();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 99d540946..1dc18122a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2197,7 +2197,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var rowInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
 
-            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())
+                  || !inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).Any(x => x.OtherMeasureData != null && x.OtherMeasureData != string.Empty))
             {
                 return string.Empty;
             }
@@ -2232,7 +2233,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<decimal?> GetSuvMax(ReadingCalculateDto inDto)
         {
-            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+
+
+
+            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())
+                 || !inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).Any(x => x.OtherMeasureData != null && x.OtherMeasureData != string.Empty))
             {
                 return null;
             }