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

导入验证修改
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-12-19 10:05:01 +08:00
parent 863a7baa29
commit ae0c7db1f0
2 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,7 +462,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
List<IVUSMeasuredValue> measuredValueList = new List<IVUSMeasuredValue>(); List<IVUSMeasuredValue> measuredValueList = new List<IVUSMeasuredValue>();
var errorRow = new List<int> { };
for (int i = 3; i < dataTable.Rows.Count; i++) for (int i = 3; i < dataTable.Rows.Count; i++)
{ {
@ -479,7 +479,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
catch (Exception) catch (Exception)
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]); errorRow.Add(i);
} }
if (iVUSMeasuredValue.Emm <= iVUSMeasuredValue.Lumen) if (iVUSMeasuredValue.Emm <= iVUSMeasuredValue.Lumen)
@ -488,8 +488,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
measuredValueList.Add(iVUSMeasuredValue); measuredValueList.Add(iVUSMeasuredValue);
} }
List<int> nums=new List<int>() { 1,2,3}; if (errorRow.Count() > 0)
if(measuredValueList.Any(x=> !nums.Contains(x.PlaqueNum))) {
var errorRows= string.Join(',', errorRow.Select(i => i.ToString()));
throw new BusinessValidationFailedException(_localizer["Service_TemplateException", errorRows]);
}
List<int> nums = new List<int>() { 1, 2, 3 };
if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum)))
{ {
throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]); throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]);
} }

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

@ -316,10 +316,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
List<OCTFCTUploadData> measuredValueList = new List<OCTFCTUploadData>(); List<OCTFCTUploadData> measuredValueList = new List<OCTFCTUploadData>();
var errorRow = new List<int> { };
try
{
for (int i = 3; i < dataTable.Rows.Count; i++) for (int i = 3; i < dataTable.Rows.Count; i++)
{
try
{ {
measuredValueList.Add(new OCTFCTUploadData() measuredValueList.Add(new OCTFCTUploadData()
{ {
@ -327,20 +328,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
FirstData = int.Parse(dataTable.Rows[i]["B"].ToString()), FirstData = int.Parse(dataTable.Rows[i]["B"].ToString()),
SecondData = int.Parse(dataTable.Rows[i]["C"].ToString()), SecondData = int.Parse(dataTable.Rows[i]["C"].ToString()),
ThirdData = int.Parse(dataTable.Rows[i]["D"].ToString()), ThirdData = int.Parse(dataTable.Rows[i]["D"].ToString()),
MacrophageInfiltrationMeasurement= dataTable.Rows[i]["E"].ToString()??string.Empty, MacrophageInfiltrationMeasurement = dataTable.Rows[i]["E"].ToString() ?? string.Empty,
MacrophageInfiltrationAngle = dataTable.Rows[i]["F"].ToString() ?? string.Empty, MacrophageInfiltrationAngle = dataTable.Rows[i]["F"].ToString() ?? string.Empty,
MicrochannelMeasurement = dataTable.Rows[i]["G"].ToString() ?? string.Empty, MicrochannelMeasurement = dataTable.Rows[i]["G"].ToString() ?? string.Empty,
CholesterolCrystalMeasurement = dataTable.Rows[i]["H"].ToString() ?? string.Empty, CholesterolCrystalMeasurement = dataTable.Rows[i]["H"].ToString() ?? string.Empty,
LumenAreaMeasurement = dataTable.Rows[i]["I"].ToString() ?? string.Empty, LumenAreaMeasurement = dataTable.Rows[i]["I"].ToString() ?? string.Empty,
}); });
} }
catch (Exception)
{
errorRow.Add(i);
}
}
measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList(); measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
}
catch (Exception) if (errorRow.Count() > 0)
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]); var errorRows = string.Join(',', errorRow.Select(i => i.ToString()));
throw new BusinessValidationFailedException(_localizer["Service_TemplateException", errorRows]);
} }
List<int> nums = new List<int>() { 1, 2, 3 }; List<int> nums = new List<int>() { 1, 2, 3 };
@ -631,10 +640,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
List<OCTFCTUploadData> measuredValueList = new List<OCTFCTUploadData>(); List<OCTFCTUploadData> measuredValueList = new List<OCTFCTUploadData>();
var errorRow = new List<int> { };
try
{
for (int i = 3; i < dataTable.Rows.Count; i++) for (int i = 3; i < dataTable.Rows.Count; i++)
{
try
{ {
measuredValueList.Add(new OCTFCTUploadData() measuredValueList.Add(new OCTFCTUploadData()
{ {
@ -643,13 +653,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}); });
} }
catch (Exception)
{
errorRow.Add(i);
}
}
measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList(); measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
} if (errorRow.Count() > 0)
catch (Exception)
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]); var errorRows = string.Join(',', errorRow.Select(i => i.ToString()));
throw new BusinessValidationFailedException(_localizer["Service_TemplateException", errorRows]);
} }