IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs

@@ -81,37 +81,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
             File.Delete(filePath);
-
-            // 创建一个要删除的行集合
-            var rowsToRemove = new System.Collections.Generic.List<DataRow>();
-
-            // 遍历DataTable的每一行
-            foreach (DataRow row in result.Rows)
-            {
-                bool allEmpty = true;
-
-                // 遍历每一列，检查值
-                foreach (var item in row.ItemArray)
-                {
-                    if (item!=null&&!item.ToString().IsNullOrEmpty())
-                    {
-                        allEmpty = false;
-                        break; // 只要有一个不为空，跳出循环
-                    }
-                }
-
-                // 如果所有列都是空字符串，则添加到待删除的行集合中
-                if (allEmpty)
-                {
-                    rowsToRemove.Add(row);
-                }
-            }
-
-            // 移除标记为待删除的行
-            foreach (var row in rowsToRemove)
-            {
-                result.Rows.Remove(row);
-            }
             return result;
         }
 

IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs

@@ -620,33 +620,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             List<IVUSMeasuredValue> measuredValueList = new List<IVUSMeasuredValue>();
 
-          
+            try
+            {
                 for (int i = 3; i < dataTable.Rows.Count; i++)
                 {
-                    IVUSMeasuredValue iVUSMeasuredValue = new IVUSMeasuredValue() { };
-                    try
+                    measuredValueList.Add(new IVUSMeasuredValue()
                     {
-                         iVUSMeasuredValue = new IVUSMeasuredValue()
-                        {
-                            PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
-                            Emm = decimal.Parse(dataTable.Rows[i]["B"].ToString()),
-                            Lumen = decimal.Parse(dataTable.Rows[i]["C"].ToString()),
-                        };
-                    }
-                    catch (Exception)
-                    {
-
-                        throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]);
-                    }
-                 
-                    if (iVUSMeasuredValue.Emm <= iVUSMeasuredValue.Lumen)
-                    {
-                        throw new BusinessValidationFailedException(_localizer["IVUS_EmmBiggerThenLumen"]);
-                    }
-                    measuredValueList.Add(iVUSMeasuredValue);
+                        PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
+                        Emm = decimal.Parse(dataTable.Rows[i]["B"].ToString()),
+                        Lumen = decimal.Parse(dataTable.Rows[i]["C"].ToString()),
+                    });
                 }
-                measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
-
+            }
+            catch (Exception)
+            {
+                throw new BusinessValidationFailedException(_localizer["IVUS_UplpadDataError"]);
+            }
 
             var questionInfo = await _readingQuestionTrialRepository.Where(x =>x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId&& x.LesionType == LesionType.MatchValues).FirstNotNullAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == questionInfo.Id).ToListAsync();

IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs

@@ -499,7 +499,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         ThirdData = int.Parse(dataTable.Rows[i]["D"].ToString()),
                     });
                 }
-                measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
             }
             catch (Exception)
             {
@@ -674,8 +673,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                       
                     });
                 }
-
-                measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
             }
             catch (Exception)
             {