From d462b9456cc121678b254b8c1fc2b64205bef1db Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 1 Sep 2022 16:46:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ReadingImageTaskService.cs                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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<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 =>