Uat_Study
he 2022-11-02 17:26:26 +08:00
parent 6c670881fa
commit c407c48061
1 changed files with 11 additions and 12 deletions

View File

@ -1424,11 +1424,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
result = NoTargetAssessment.PD;
}
//所有单个病灶/病灶组状态评估状态为“消失”
else if (tableQuestions.Count(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.Loss))== tableQuestions.Count(x=> x.QuestionMark == QuestionMark.State))
{
result = NoTargetAssessment.CR;
}
// 任意单个病灶/病灶组评估为“无法评估”并且没有“显著增大”
else if (tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.UnableEvaluate)) &&
!tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.Increase))
@ -1436,14 +1431,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
result = NoTargetAssessment.NE;
}
// 基线时没有非靶病灶
else if (tableQuestions.Count() == 0)
{
result = NoTargetAssessment.ND;
}
// 所有单个病灶/病灶组评估为”存在”或者有些评估为“消失”有些评估为“存在”,且没有“显著增大”和“无法评估”的病灶
else if (tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.Exist))
&& !tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && (x.Answer.EqEnum(NoTargetState.Increase) || x.Answer.EqEnum(NoTargetState.UnableEvaluate)))
@ -1451,6 +1439,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
result = NoTargetAssessment.NN;
}
//所有单个病灶/病灶组状态评估状态为“消失”
else if (tableQuestions.Count(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.Loss))== tableQuestions.Count(x=> x.QuestionMark == QuestionMark.State))
{
result = NoTargetAssessment.CR;
}
// 基线时没有非靶病灶
else if (tableQuestions.Count() == 0)
{
result = NoTargetAssessment.ND;
}
else
{
return string.Empty;