XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-08 11:32:25 +08:00
parent a21cca53f8 4a03467968
commit 86c871bc9f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
View File

@ -497,7 +497,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<ReadingCalculateData> calculateList = new List<ReadingCalculateData>()
{
// 脂肪平均
new ReadingCalculateData (){QuestionType=QuestionType.TotalMeanFraction,GetDecimalFun=GetFatFractionAvg},
new ReadingCalculateData (){QuestionType=QuestionType.TotalMeanFraction,GetStringFun=GetFatFractionAvg},
};
@ -541,7 +541,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
ValueOfType.Percentage
};
if (inDto.DigitPlaces != -1)
if (inDto.DigitPlaces != -1 && calculate.GetDecimalFun != null && calculate.GetDecimalNullFun != null)
{
try
{
@ -590,7 +590,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<decimal> GetFatFractionAvg(ReadingCalculateDto inDto)
public async Task<string> GetFatFractionAvg(ReadingCalculateDto inDto)
{
decimal result = 0;
@ -601,10 +601,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (tableQuestionList.Count() == 0)
{
return result;
return "NE";
}
result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).Average(x => x.Answer.IsNullOrEmptyReturn0());
return result;
return decimal.Round(result, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); ;
}
@ -638,7 +638,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
if(item.TableQuestionList.Where(x => x.QuestionMark== QuestionMark.IsMeasurable).Select(x => x.Answer).FirstOrDefault().EqEnum(YesOrNoOrNa.No))
{
avgAnswer = "NA";
avgAnswer = "NE";
}
tableAnswers.Add(new ReadingTableQuestionAnswer()
{