From ab6a965a904a7a834f7c350b2b832dc310fff164 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 24 Nov 2022 11:53:33 +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

---
 .../ReadingImageTask/ReadingGlobalTaskService.cs   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index 1eb30dc34..8dc61520b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -133,8 +133,22 @@ namespace IRaCIS.Application.Services
                 }).ToListAsync();
 
 
+
             var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync();
             var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
+            if (criterionType == CriterionType.PCWG3)
+            {
+                result.TaskList.ForEach(x =>
+                {
+
+                    x.BeforeQuestionList.ForEach(y =>
+                    {
+                        var globalAnswer = globalReadingQuestion.Where(z => z.QuestionId == y.QuestionId).Select(z => z.Answer).FirstOrDefault();
+                        y.Answer = globalAnswer.IsNullOrEmpty() ? y.Answer : globalAnswer;
+                    });
+                });
+            }
+            
             result.TaskList.ForEach(x =>
             {
                 x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin(