From 42f9f683959f65291aee8ca45039a5d48a5567cb Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 11 Jul 2022 11:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalDataSetService.cs |  2 +-
 .../Reading/ReadingImageTaskService.cs        | 25 +++++++++++++++++--
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       |  9 +++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
index aef9d951..c95a3c63 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
@@ -130,7 +130,7 @@ namespace IRaCIS.Application.Services
         private async Task AddTrialClinicalDataTrialSet(Guid trialId)
         {
             var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync();
-            if (syncClinicalDataTime != null)
+            if (syncClinicalDataTime == null)
             {
                 var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
                 var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 98dacfc8..edfdb6a1 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -315,12 +315,33 @@ namespace IRaCIS.Application.Services
                        Answer= leftquestionAnswer.Answer
                      };
 
+
+
             var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync();
-            List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
+
+            var groupList = qusetionList.Where(x => x.Type == "group").ToList();
+
             groupList.ForEach(x =>
             {
-                this.FindChildQuestion(x, qusetionList);
+                x.Childrens = qusetionList.Where(y => y.GroupName == x.QuestionName && y.ParentId == null).ToList();
+
+                x.Childrens.ForEach(z =>
+                {
+                    this.FindChildQuestion(z, qusetionList);
+                });
+
             });
+
+
+
+            //List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
+
+
+
+            //groupList.ForEach(x =>
+            //{
+            //    this.FindChildQuestion(x, qusetionList);
+            //});
             return (groupList, new
             {
                 readingTaskState = readingTaskState
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index f695157b..e84c71e6 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -285,7 +285,16 @@ namespace IRaCIS.Core.Application.Contracts
         public string SignCode { get; set; } = string.Empty;
     }
 
+    public class GetReadingInfoOutDto
+    {
+        
+    }
 
+    public class GetReadingInfoInDto
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+    }
 
     public class SignConfirmDTO
     {