修改计算
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
eedfa4b84d
commit
8a20051436
|
@ -622,7 +622,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
foreach (var item in questionInfo.TableRowInfoList)
|
foreach (var item in questionInfo.TableRowInfoList)
|
||||||
{
|
{
|
||||||
var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault();
|
var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault();
|
||||||
var avgAnswer = "NA";
|
var avgAnswer = string.Empty;
|
||||||
List<QuestionMark?> questionMarks = new List<QuestionMark?>()
|
List<QuestionMark?> questionMarks = new List<QuestionMark?>()
|
||||||
{
|
{
|
||||||
QuestionMark.FirstMeasurement,
|
QuestionMark.FirstMeasurement,
|
||||||
|
@ -635,7 +635,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
var avgAnswernum= answers.Select(x=>x.IsNullOrEmptyReturn0()).Average(x=>x);
|
var avgAnswernum= answers.Select(x=>x.IsNullOrEmptyReturn0()).Average(x=>x);
|
||||||
avgAnswer = decimal.Round(avgAnswernum, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString());
|
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()
|
tableAnswers.Add(new ReadingTableQuestionAnswer()
|
||||||
{
|
{
|
||||||
Answer = avgAnswer,
|
Answer = avgAnswer,
|
||||||
|
|
Loading…
Reference in New Issue