From f6d65b5abefab547ac9f1ae8bffbe0311502dd0b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 26 Aug 2022 14:58: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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  2 +-
 .../Reading/ReadingImageTaskService.cs        | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index df3e920a8..c3c5e96ac 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1010,7 +1010,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionMark? QuestionMark { get; set; }
 
-        public List<Guid> RelationIds { get; set; }
+        public List<GetSystemReadingQuestionOutDto> RelationQuestions { get; set; }
 
 
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 10eb4682c..b57319404 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1064,7 +1064,29 @@ namespace IRaCIS.Application.Services
                 DataTableColumn = x.DataTableColumn,
                 LesionType = item.LesionType,
                 QuestionName = x.QuestionName,
-                RelationIds = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(z => z.Id).ToList(),
+                RelationQuestions = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetSystemReadingQuestionOutDto
+                {
+                    Childrens = new List<GetSystemReadingQuestionOutDto>(),
+                    ShowOrder = x.ShowOrder,
+                    GroupName = string.Empty,
+                    Id = x.Id,
+                    Type = x.Type,
+                    TableQuestionType = x.TableQuestionType,
+                    DependParentId = x.DependParentId,
+                    IsDepend = x.IsDepend,
+                    QuestionMark = x.QuestionMark,
+                    TypeValue = x.TypeValue,
+                    RelevanceId = x.RelevanceId,
+                    RelevanceValue = x.RelevanceValue,
+                    ImageCount = 0,
+                    ParentId = item.Id,
+                    DataTableColumn = x.DataTableColumn,
+                    LesionType = item.LesionType,
+                    QuestionName = x.QuestionName,
+                    RelationQuestions = new List<GetSystemReadingQuestionOutDto>(),
+                    Remark = x.Remark,
+
+                }).ToList(),
                 Remark = x.Remark,
 
             }));