From 43c0885e0aec79fa6b65f57e024c5d136673f9c5 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 15 Sep 2025 14:25:17 +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

---
 .../IRaCIS.Core.Application.xml               |  2 +-
 .../MRECISTHCCCalculateService.cs             | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9e041e0e6..e1b06291f 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5395,7 +5395,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.ChangeLastTaskSiteVisitForTumorEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
-            修改上一次访视结果
+            修改上一次访视结果 并且计算是不是PD
             </summary>
             <param name="inDto"></param>
             <returns></returns>
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 169009033..a641b807c 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -879,20 +879,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         foreach (var item in recistTableAnswers)
                         {
                             var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
-                            if (rowinfo != null && portalOrgan!=null && rowinfo.OriginalId== portalOrgan.Id)
+                            if (rowinfo != null)
                             {
                                 item.QuestionId = rowinfo.QuestionId;
 
-                              
 
-                                var IslymphNode= recistTableAnswers.Where(x=>x.RowId== item.RowId&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
-                                var minorAxis= recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
-                                
-                                var iSbetween15and20= minorAxis >= 15 && minorAxis < 20;
-                                if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
+                                if (portalOrgan != null && rowinfo.OriginalId == portalOrgan.Id)
                                 {
-                                    item.Answer = string.Empty;
+                                    var IslymphNode = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.IsLymph).Select(x => x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
+                                    var minorAxis = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
+
+                                    var iSbetween15and20 = minorAxis >= 15 && minorAxis < 20;
+                                    if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
+                                    {
+                                        item.Answer = string.Empty;
+                                    }
                                 }
+                               
                             }