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
///
/// 帧数
///
- public decimal? FrameNumber { get; set; }
+ public string FrameNumber { get; set; }
///
/// 外弹力膜面积Emm
@@ -252,7 +252,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 帧数
///
- public decimal? FrameNumber { get; set; }
+ public string FrameNumber { get; set; }
///
/// 第一次
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;