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,