修改计算
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-01-08 16:02:45 +08:00
parent 36ea9f526e
commit c87c724685
1 changed files with 11 additions and 3 deletions

View File

@ -602,6 +602,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var tableQuestionList = rowInfo.Where(x=>x.TableQuestionList.Any(x=>x.QuestionMark== QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.Yes))).SelectMany(x => x.TableQuestionList).ToList(); var tableQuestionList = rowInfo.Where(x=>x.TableQuestionList.Any(x=>x.QuestionMark== QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.Yes))).SelectMany(x => x.TableQuestionList).ToList();
if (rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).SelectMany(x => x.TableQuestionList).ToList().Count() != 8)
{
return string.Empty;
}
if (tableQuestionList.Count() == 0) if (tableQuestionList.Count() == 0)
{ {
return "NE"; return "NE";
@ -619,10 +623,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task<string> GetFattyLiverGrading(ReadingCalculateDto inDto) public async Task<string> GetFattyLiverGrading(ReadingCalculateDto inDto)
{ {
var answer = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TotalMeanFraction).Select(x => x.Answer).FirstIsNullReturnEmpty(); var answer = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TotalMeanFraction).Select(x => x.Answer).FirstIsNullReturnEmpty();
if (answer == "NE" || answer == string.Empty) if (answer == "NE")
{ {
return FattyLiverClassification.NE.GetEnumInt(); return FattyLiverClassification.NE.GetEnumInt();
} }
else if(answer == string.Empty)
{
return string.Empty;
}
if (decimal.TryParse(answer, out var value)) if (decimal.TryParse(answer, out var value))
{ {
@ -708,7 +716,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction) var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
.SelectMany(x => x.TableRowInfoList).ToList(); .SelectMany(x => x.TableRowInfoList).ToList();
var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.IsNotNullOrEmpty())).ToList(); var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).ToList();
if (tableQuestionList.Count() != 8) if (tableQuestionList.Count() != 8)
{ {