From 8a20051436241189da489a7c591b6ded864f222a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 30 Dec 2024 14:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/MRIPDFFCalculateService.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs index 3662bb1c5..f51c9d151 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs @@ -622,7 +622,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate foreach (var item in questionInfo.TableRowInfoList) { var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault(); - var avgAnswer = "NA"; + var avgAnswer = string.Empty; List questionMarks = new List() { QuestionMark.FirstMeasurement, @@ -635,7 +635,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var avgAnswernum= answers.Select(x=>x.IsNullOrEmptyReturn0()).Average(x=>x); avgAnswer = decimal.Round(avgAnswernum, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); } - + if(item.TableQuestionList.Where(x => x.QuestionMark== QuestionMark.IsMeasurable).Select(x => x.Answer).FirstOrDefault().EqEnum(YesOrNoOrNa.No)) + { + avgAnswer = "NA"; + } tableAnswers.Add(new ReadingTableQuestionAnswer() { Answer = avgAnswer,