diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 9a5d7ffd0..c5fab46d5 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -336,18 +336,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList(); - List nums = new List() { 1, 2, 3 }; - if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) - { - throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]); - } + } catch (Exception) { throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]); } - + List nums = new List() { 1, 2, 3 }; + if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) + { + throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]); + } Dictionary isPresent = new Dictionary() { @@ -646,11 +646,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList(); - List nums = new List() { 1, 2, 3 }; - if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) - { - throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]); - } } catch (Exception) { @@ -658,6 +653,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } + List nums = new List() { 1, 2, 3 }; + if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) + { + throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]); + } + + foreach (var item in measuredValueList) { if (item.FirstData > 360)