IRC_NewDev
parent
29836a9c62
commit
662648691d
Binary file not shown.
|
@ -2686,6 +2686,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault();
|
||||||
|
//本访视无PET图像
|
||||||
|
if (existPET.EqEnum(ReadingYesOrNo.No))
|
||||||
|
{
|
||||||
|
return SUVChangeVSBaseline.NotEvaluable.GetEnumInt();
|
||||||
|
}
|
||||||
|
|
||||||
//PET5ps评分改变时,才计算
|
//PET5ps评分改变时,才计算
|
||||||
|
|
||||||
List<QuestionType?> needSearchTypes = new List<QuestionType?>()
|
List<QuestionType?> needSearchTypes = new List<QuestionType?>()
|
||||||
|
@ -2717,11 +2724,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
return SUVChangeVSBaseline.NA.GetEnumInt();
|
return SUVChangeVSBaseline.NA.GetEnumInt();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
|
|
||||||
{
|
|
||||||
return SUVChangeVSBaseline.NotEvaluable.GetEnumInt();
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = SUVChangeVSBaseline.NotEvaluable;
|
var result = SUVChangeVSBaseline.NotEvaluable;
|
||||||
var baseLineTaskId = await GetBaseLineTaskId(inDto);
|
var baseLineTaskId = await GetBaseLineTaskId(inDto);
|
||||||
|
|
||||||
|
@ -2730,15 +2732,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
var baseLinePET5PS = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.PET5PS).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
|
|
||||||
|
var baseLinePET5PSValue = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.PET5PS).Select(x => x.Answer).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
||||||
var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault();
|
var baseLinePET5PS = baseLinePET5PSValue.IsNullOrEmptyReturn0();
|
||||||
//本访视无PET图像
|
|
||||||
if (existPET.EqEnum(ReadingYesOrNo.No))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 基线为NE或者X 为空
|
||||||
|
if (baseLinePET5PSValue.EqEnum(PET5PSScore.X) || baseLinePET5PSValue.EqEnum(PET5PSScore.NE))
|
||||||
{
|
{
|
||||||
result = SUVChangeVSBaseline.NotEvaluable;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
//本访视PET评分>基线PET评分
|
//本访视PET评分>基线PET评分
|
||||||
else if (PET5PS > baseLinePET5PS)
|
else if (PET5PS > baseLinePET5PS)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue