IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs

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