From c6a18aa18ad60bd21bcd4de9c10dd1c41d13698a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 30 Sep 2024 11:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/IVUSCalculateService.cs | 14 +++++++------- .../ReadingCalculate/OCTCalculateService.cs | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index e47eb0e69..373b45c44 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -527,7 +527,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (valueOfTypes.Contains(item.ValueType)) { - item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); + item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); } } catch (Exception) @@ -705,9 +705,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (taskinfo.TrialReadingCriterion.DigitPlaces != -1) { var digitPlaces= taskinfo.TrialReadingCriterion.DigitPlaces??0; - emm = decimal.Round(decimal.Parse(emm ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString()); - lumen = decimal.Round(decimal.Parse(lumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString()); - emmSubtractionLumen = decimal.Round(decimal.Parse(emmSubtractionLumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString()); + emm = decimal.Round(decimal.Parse(emm ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()); + lumen = decimal.Round(decimal.Parse(lumen ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()); + emmSubtractionLumen = decimal.Round(decimal.Parse(emmSubtractionLumen ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()); } // EMM @@ -845,9 +845,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (inDto.DigitPlaces != -1) { - emm = decimal.Round(decimal.Parse(emm ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); - EEMLumen = decimal.Round(decimal.Parse(EEMLumen ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); - pav = decimal.Round(decimal.Parse(pav ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); + emm = decimal.Round(decimal.Parse(emm ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); + EEMLumen = decimal.Round(decimal.Parse(EEMLumen ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); + pav = decimal.Round(decimal.Parse(pav ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); } #endregion diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index d778140f8..18dd08dc8 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -562,7 +562,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (taskinfo.TrialReadingCriterion.DigitPlaces != -1) { var digitPlaces = taskinfo.TrialReadingCriterion.DigitPlaces ?? 0; - avg = decimal.Round(decimal.Parse(avg ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString()); + avg = decimal.Round(decimal.Parse(avg ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()); } @@ -747,7 +747,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (taskinfo.TrialReadingCriterion.DigitPlaces != -1) { var digitPlaces = taskinfo.TrialReadingCriterion.DigitPlaces ?? 0; - avg = decimal.Round(decimal.Parse(avg ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString()); + avg = decimal.Round(decimal.Parse(avg ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()); } @@ -856,7 +856,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (valueOfTypes.Contains(item.ValueType)) { - item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); + item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); } } catch (Exception) @@ -951,7 +951,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { if (inDto.DigitPlaces != -1) { - value = decimal.Round(decimal.Parse(value ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); + value = Math.Round(decimal.Parse(value ?? "0"), inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); } return value; @@ -1000,7 +1000,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 匹配动脉段最小FCT tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), + Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "NA" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, @@ -1013,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 平均最小FCT tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), + Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "NA" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, @@ -1026,7 +1026,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 脂质角度平均值 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), + Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "NA" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, @@ -1039,7 +1039,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 脂质角度最大值 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), + Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "NA" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId,