Test.EIImageViewer
he 2022-09-01 16:46:53 +08:00
parent cb4a965a52
commit d462b9456c
1 changed files with 3 additions and 1 deletions

View File

@ -352,8 +352,10 @@ namespace IRaCIS.Application.Services
#region 获取问题及答案
var qusetionList = await _readingQuestionTrialRepository.Where(x=>x.ReadingQuestionCriterionTrialId== criterion.Id)
.ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider).Where(x=>x.IsShowInDicom && x.Type != "table").OrderBy(x => x.ShowOrder).ToListAsync();
.ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider).Where(x=>x.IsShowInDicom && (x.Type == "table"||x.Type== "group")).OrderBy(x => x.ShowOrder).ToListAsync();
var usedGurops = qusetionList.Where(x => x.Type == "table").Select(x => x.GroupName).ToList();
qusetionList = qusetionList.Where(x => x.Type == "table" || usedGurops.Contains(x.GroupName)).ToList();
var answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
qusetionList.ForEach(x =>