From 77f9275d93c8a456822acebb425ae786ea1f69c1 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 8 Dec 2025 16:15:29 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ReadingCalculate/OCTCalculateService.cs  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index 9219c3798..034427f45 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -1200,7 +1200,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 巨噬细胞浸润测量
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item&&x.MacrophageInfiltrationMeasurement.EqEnum(IsPresent.Existence))? IsPresent.Existence.GetEnumInt(): IsPresent.NonExistence.GetEnumInt(),
+                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item && x.MacrophageInfiltrationMeasurement != string.Empty) ?
+                    oCTFCTInfos.Any(x => x.PlaqueNum == item&&x.MacrophageInfiltrationMeasurement.EqEnum(IsPresent.Existence))? IsPresent.Existence.GetEnumInt(): IsPresent.NonExistence.GetEnumInt()
+                    :string.Empty,
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,
@@ -1226,7 +1228,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 微通道
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item && x.MicrochannelMeasurement.EqEnum(IsPresent.Existence)) ? IsPresent.Existence.GetEnumInt() : IsPresent.NonExistence.GetEnumInt(),
+                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item && x.MicrochannelMeasurement != string.Empty) ?
+                    oCTFCTInfos.Any(x => x.PlaqueNum == item && x.MicrochannelMeasurement.EqEnum(IsPresent.Existence)) ? IsPresent.Existence.GetEnumInt() : IsPresent.NonExistence.GetEnumInt()
+                    :string.Empty,
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,
@@ -1239,7 +1243,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 胆固醇结晶测量
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item && x.CholesterolCrystalMeasurement.EqEnum(IsPresent.Existence)) ? IsPresent.Existence.GetEnumInt() : IsPresent.NonExistence.GetEnumInt(),
+                    Answer = oCTFCTInfos.Any(x => x.PlaqueNum == item && x.CholesterolCrystalMeasurement != string.Empty) ?
+                    oCTFCTInfos.Any(x => x.PlaqueNum == item && x.CholesterolCrystalMeasurement.EqEnum(IsPresent.Existence)) ? IsPresent.Existence.GetEnumInt() : IsPresent.NonExistence.GetEnumInt()
+                    :string.Empty,
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,