OCT05

2025-12-09 10:02:44 +08:00
parent 867ee32f91
commit 2b24ce723e
2 changed files with 3 additions and 3 deletions
@@ -890,7 +890,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                    PlaqueNum = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.PlaqueNumber).Select(x => int.Parse(x.Answer)).FirstOrDefault(),
                    Data = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AvgFCT).Select(x => decimal.Parse(x.Answer)).FirstOrDefault(),
                    MacrophageInfiltrationMeasurement = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.MacrophageInfiltrationMeasurement).Select(x => x.Answer).FirstOrDefault()??string.Empty,
-                    MacrophageInfiltrationAngle = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.MacrophageInfiltrationAngle).Select(x => x.Answer.IsNullOrEmptyReturn0()).FirstOrDefault(),
+                    MacrophageInfiltrationAngle = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.MacrophageInfiltrationAngle).Select(x => x.Answer.IsNullOrEmptyReturnNull()).FirstOrDefault(),
                    MicrochannelMeasurement = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.MicrochannelMeasurement).Select(x => x.Answer).FirstOrDefault() ?? string.Empty,
                    CholesterolCrystalMeasurement = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.CholesterolCrystalMeasurement).Select(x => x.Answer).FirstOrDefault() ?? string.Empty,
                });
@@ -1015,7 +1015,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                // 巨噬细胞浸润角度测量
                tableAnswers.Add(new ReadingTableQuestionAnswer()
                {
-                    Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? string.Empty : oCTFCTInfos.Where(x => x.PlaqueNum == item).Max(x=>x.MacrophageInfiltrationAngle).ToString(),
+                    Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item&&x.MacrophageInfiltrationAngle!=null).Count() == 0 ? string.Empty : oCTFCTInfos.Where(x => x.PlaqueNum == item).Max(x=>x.MacrophageInfiltrationAngle??0).ToString(),
                    Id = NewId.NextGuid(),
                    QuestionId = patchDataStatisticsInfo.Id,
                    TrialId = inDto.TrialId,