From e1632b58ac4d7b0c3ef7a66fdff071c601fe4a12 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 16:21:26 +0800
Subject: [PATCH] =?UTF-8?q?lugano=20=E9=95=BF=E7=9F=AD=E7=BB=8F=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/Export/TumorExportService.cs       | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index 21a563927..dd8ce3cd5 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -514,7 +514,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                 {
                     if (OncologyResult.OncologyReason.IsNotNullOrEmpty())
                     {
-                        
+
                         var co = CreatNewCOExport(task, coList.Count + 1);
 
                         co.RemarksQuote = $"{OncologyResult?.VisitName}_ONCOLOGY_COMMENTS";
@@ -525,7 +525,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                         co.Remarks = OncologyResult.OncologyReason;
 
-                        
+
 
                         co.CODTC = task.SignTime?.ToString("yyyy-MM-dd");
 
@@ -535,7 +535,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                     if (OncologyResult.OncologyResult.IsNotNullOrEmpty())
                     {
 
-                        var visitTask = taskList.Where(t => t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode==task.SubjectCode).FirstOrDefault();
+                        var visitTask = taskList.Where(t => t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode == task.SubjectCode).FirstOrDefault();
 
                         var rs = CreatNewRSExport(task, rs_subjectIndexNoDic);
 
@@ -547,7 +547,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                         rs.LatestScanDate = visitTask?.LatestScanDate;
                         rs.EarliestScanDate = visitTask?.EarliestScanDate;
-                    
+
 
                         Fill_RS_IndexValue(rs, 9, Lugano_RSFixed.RSValueList);
 
@@ -781,7 +781,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                         rsValueList = RESIST_RSFixed.RSValueList;
 
-                        overallPD = "PD"; 
+                        overallPD = "PD";
 
                     }
                     else if (criterion.CriterionType == CriterionType.Lugano2014)
@@ -1205,6 +1205,38 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             }
         }
 
+        if (trValueTypeIndex == 0 || trValueTypeIndex == 1)
+        {
+            if (lesion.LessionType == LesionType.TargetLesion)
+            {
+                //处理消失 空为0mm
+                if (lessionAnswer.QuestionValue.IsNullOrEmpty() && lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.State)?.QuestionValue == "3")
+                {
+
+                    lessionAnswer.QuestionValue = "0";
+                }
+            }
+            //有值 就展示，没值就不展示
+            else if (lesion.LessionType == LesionType.NonTargetLesions || lesion.LessionType == LesionType.NewLesions)
+            {
+
+                if (lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.ShortAxis)?.QuestionValue.IsNotNullOrEmpty() == true
+                    || lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.MajorAxis)?.QuestionValue.IsNotNullOrEmpty() == true)
+                {
+
+                }
+                else
+                {
+                    trValueTypeIndex = -1;
+                }
+
+            }
+            else
+            {
+                trValueTypeIndex = -1;
+            }
+        }
+
         return trValueTypeIndex;