From 8defcae83fbb3e8396ab0831b13ec9cd5c16b301 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 19 Dec 2025 18:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/OCTCalculateService.cs     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index b8f732f4a..b9de169ef 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -367,27 +367,38 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 { string.Empty,string.Empty},
             };
 
+            int row = 2;
             foreach (var item in measuredValueList)
             {
+                row++;
                 try
                 {
                     if (isPresent[item.MacrophageInfiltrationMeasurement] == "1"&& item.MacrophageInfiltrationAngle==string.Empty)
                     {
-                        throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]);
+                        errorRow.Add(row);
+                        continue;
                     }
 
                     if ((isPresent[item.MacrophageInfiltrationMeasurement] == "0"|| isPresent[item.MacrophageInfiltrationMeasurement]==string.Empty) && item.MacrophageInfiltrationAngle != string.Empty)
                     {
-                        throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]);
+                        errorRow.Add(row);
+                        continue;
                     }
                 }
                 catch (Exception)
                 {
 
-                    throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]);
+                    errorRow.Add(row);
+                    continue;
                 }
             }
 
+            if (errorRow.Count() > 0)
+            {
+                var errorRows = string.Join(',', errorRow.Select(i => i.ToString()));
+                throw new BusinessValidationFailedException(_localizer["Service_TemplateException", errorRows]);
+            }
+
             var questionInfo = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == LesionType.FCT).FirstNotNullAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == questionInfo.Id).ToListAsync();
             List<ReadingTableAnswerRowInfo> tableAnsweRowInfos = new List<ReadingTableAnswerRowInfo>();