From 4969e0f812a3509680d7f84c70622d1c61b2d892 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 16 Mar 2026 15:43:37 +0800
Subject: [PATCH] =?UTF-8?q?OCT=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingCalculateViewModel.cs      |  4 ++--
 .../ReadingCalculate/IVUSCalculateService.cs      |  4 ++--
 .../ReadingCalculate/OCTCalculateService.cs       |  4 ++--
 IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs  | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
index 33c6da229..d35992f04 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
@@ -216,7 +216,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 帧数
         /// </summary>
-        public decimal? FrameNumber { get; set; }
+        public string FrameNumber { get; set; }
 
         /// <summary>
         /// 外弹力膜面积Emm
@@ -252,7 +252,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 帧数
         /// </summary>
-        public decimal? FrameNumber { get; set; }
+        public string FrameNumber { get; set; }
 
         /// <summary>
         /// 第一次
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
index a8d119aaa..3914b7b4e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
@@ -512,7 +512,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     iVUSMeasuredValue = new IVUSMeasuredValue()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
-                        FrameNumber = getdecimalEmptyData(dataTable.Rows[i]["A"].ToString()),
+                        FrameNumber = dataTable.Rows[i]["A"].ToString()??string.Empty,
                         Emm = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
                         Lumen = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
                     };
@@ -587,7 +587,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // EMM 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = getStringValue(item.FrameNumber),
+                    Answer = item.FrameNumber,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index a74ae2b33..ddb0cb399 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -354,7 +354,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     measuredValueList.Add(new OCTFCTUploadData()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
-                        FrameNumber = getdecimalEmptyData(dataTable.Rows[i]["A"].ToString()),
+                        FrameNumber = dataTable.Rows[i]["F"].ToString() ?? string.Empty,
                         FirstData = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
                         SecondData = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
                         ThirdData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()),
@@ -467,7 +467,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 帧数
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.FrameNumber.DecimalNullToString(digitPlaces),
+                    Answer = item.FrameNumber,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
index 7d632c633..c5931bd05 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
@@ -131,6 +131,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
         }
 
+
+        public static string IntNullToString(this int? value)
+        {
+          
+            if (value == null)
+            {
+                return string.Empty;
+            }
+           
+            else
+            {
+                return value.Value.ToString();
+            }
+        }
+
         public static string DecimalNullToString (this decimal? value,int ? digitPlaces)
         {
             digitPlaces = digitPlaces ?? 0;