修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
c7103654e3
commit
6a1cd07951
|
@ -2424,32 +2424,33 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
// 如果当前添加 是 非靶病灶 并且 典型肝内病灶为 是 时 如果 靶病灶的典型肝内病灶 为是的 数量<2 给提示
|
// 如果当前添加 是 非靶病灶 并且 典型肝内病灶为 是 时 如果 靶病灶的典型肝内病灶 为是的 数量<2 给提示
|
||||||
|
|
||||||
|
// 验证去掉
|
||||||
|
|
||||||
if (questionInfo.LesionType == LesionType.NonTargetLesions)
|
//if (questionInfo.LesionType == LesionType.NonTargetLesions)
|
||||||
{
|
//{
|
||||||
// 非靶病灶
|
// // 非靶病灶
|
||||||
var tablequestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId && x.ReadingQuestionId == inDto.QuestionId).ToListAsync();
|
// var tablequestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId && x.ReadingQuestionId == inDto.QuestionId).ToListAsync();
|
||||||
// 判断表格问题是否为空
|
// // 判断表格问题是否为空
|
||||||
|
|
||||||
var tableQuestion = tablequestionList.Where(x => x.QuestionMark == QuestionMark.TypicalIntrahepaticLesion).FirstOrDefault();
|
// var tableQuestion = tablequestionList.Where(x => x.QuestionMark == QuestionMark.TypicalIntrahepaticLesion).FirstOrDefault();
|
||||||
if (tableQuestion != null)
|
// if (tableQuestion != null)
|
||||||
{
|
// {
|
||||||
if (inDto.AnswerList.Where(x => x.TableQuestionId == tableQuestion.Id).Select(x => x.Answer).FirstOrDefault().EqEnum(ReadingYesOrNo.Yes))
|
// if (inDto.AnswerList.Where(x => x.TableQuestionId == tableQuestion.Id).Select(x => x.Answer).FirstOrDefault().EqEnum(ReadingYesOrNo.Yes))
|
||||||
{
|
// {
|
||||||
|
|
||||||
var yesString = ((int)(object)ReadingYesOrNo.Yes).ToString();
|
// var yesString = ((int)(object)ReadingYesOrNo.Yes).ToString();
|
||||||
|
|
||||||
var targetList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion
|
// var targetList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion
|
||||||
&& x.LesionAnswerList.Any(y => y.Answer == yesString && y.ReadingTableQuestionTrial.QuestionMark == QuestionMark.TypicalIntrahepaticLesion)
|
// && x.LesionAnswerList.Any(y => y.Answer == yesString && y.ReadingTableQuestionTrial.QuestionMark == QuestionMark.TypicalIntrahepaticLesion)
|
||||||
).ToListAsync();
|
// ).ToListAsync();
|
||||||
if (targetList.Count() < 2)
|
// if (targetList.Count() < 2)
|
||||||
{
|
// {
|
||||||
throw new BusinessValidationFailedException(_localizer["ReadingImageTask_PriorityTarget"]);
|
// throw new BusinessValidationFailedException(_localizer["ReadingImageTask_PriorityTarget"]);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue