From fb2fdd2c27c26c699cbbdeab41cc9fa5960e1eec Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Nov 2025 15:47:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/Export/TumorExportService.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index cf4f60a68..1d0efdc85 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -1786,6 +1786,6 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             }
 
         }
-        return resultExceptJudgeList.Union(judegeList).ToList();
+        return resultExceptJudgeList.Union(judegeList).OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ThenBy(t => t.ArmEnum).ToList();
     }
 }

From 3981f2cd509950dd82f19cd6ed58a03c0b184421 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Nov 2025 16:15:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/Export/CDISCExportBaseModel.cs           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs b/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
index 822de893b..4562bab26 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
@@ -368,7 +368,11 @@ public class TR_Export : TU_TR_RSBaseModel
     /// <summary>
     /// 标准结果（数值） TRORRESU
     /// </summary>
-    public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ? OriginalMeasurements : "";
+    public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ||
+    (OriginalMeasurements?.EndsWith("%") == true &&
+     double.TryParse(OriginalMeasurements.TrimEnd('%'), out _))
+        ? OriginalMeasurements
+        : "";
 
     /// <summary>
     /// 标准单位 TRSTRESU