diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 2acdeccc..22d456cf 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -352,8 +352,10 @@ namespace IRaCIS.Application.Services #region 获取问题及答案 var qusetionList = await _readingQuestionTrialRepository.Where(x=>x.ReadingQuestionCriterionTrialId== criterion.Id) - .ProjectTo(_mapper.ConfigurationProvider).Where(x=>x.IsShowInDicom && x.Type != "table").OrderBy(x => x.ShowOrder).ToListAsync(); + .ProjectTo(_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 =>