XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT修改2
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2026-03-16 15:43:37 +08:00
parent bb7f6f3a1c
commit 4969e0f812
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

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

4
IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
View File

@ -512,7 +512,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
iVUSMeasuredValue = new IVUSMeasuredValue() iVUSMeasuredValue = new IVUSMeasuredValue()
{ {
//PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()), //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()), Emm = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
Lumen = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()), Lumen = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
}; };
@ -587,7 +587,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// EMM // EMM
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = getStringValue(item.FrameNumber), Answer = item.FrameNumber,
QuestionId = questionInfo.Id, QuestionId = questionInfo.Id,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
VisitTaskId = taskinfo.Id, VisitTaskId = taskinfo.Id,

4
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -354,7 +354,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
measuredValueList.Add(new OCTFCTUploadData() measuredValueList.Add(new OCTFCTUploadData()
{ {
//PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()), //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()), FirstData = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
SecondData = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()), SecondData = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
ThirdData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()), ThirdData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()),
@ -467,7 +467,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 帧数 // 帧数
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = item.FrameNumber.DecimalNullToString(digitPlaces), Answer = item.FrameNumber,
QuestionId = questionInfo.Id, QuestionId = questionInfo.Id,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
VisitTaskId = taskinfo.Id, VisitTaskId = taskinfo.Id,

15
IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
View File

@ -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) public static string DecimalNullToString (this decimal? value,int ? digitPlaces)
{ {
digitPlaces = digitPlaces ?? 0; digitPlaces = digitPlaces ?? 0;