From 6d11fc68b441a82e8c3251d0b707a26baffca27d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 11 Nov 2025 13:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/Export/CDISCExportBaseModel.cs     |  2 ++
 .../Service/Common/Export/RESISTExportService.cs      | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs b/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
index 3bf4379c6..7c00bfad6 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
@@ -24,6 +24,8 @@ public class TumorCommonQustionInfo
     public string TranslateDicName { get; set; }
 
     public ValueUnit? Unit { get; set; }
+
+    public ValueOfType? ValueType { get; set; }
 }
 
 public class TumorLessionInfo
diff --git a/IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs
index e28be0d9d..7dc30e311 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs
@@ -302,6 +302,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                 QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
                 QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
                 TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
+                ValueType = c.ReadingQuestionTrial.ValueType,
                 Unit = c.ReadingQuestionTrial.Unit
             }).ToList(),
 
@@ -576,7 +577,15 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                     }
                     else
                     {
-                        tr.OriginalMeasurements = questionAnswer.QuestionValue;
+                        if (questionAnswer.ValueType == ValueOfType.Percentage)
+                        {
+                            tr.OriginalMeasurements = questionAnswer.QuestionValue +"%";
+
+                        }
+                        else
+                        {
+                            tr.OriginalMeasurements = questionAnswer.QuestionValue;
+                        }
                     }
 
                     tr.OriginalUnit = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)questionAnswer.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;