From e66591c871c4b8811ffea9c09bf339667c48aacb Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 22 Jul 2022 09:49: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             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 7631a1b6..8ac9c47d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -191,7 +191,12 @@ namespace IRaCIS.Application.Services
                       , (l, r) => new { question = l, global = r })
                   .SelectMany(lr => lr.global.DefaultIfEmpty(), (lr, r) => new GlobalQuestionInfo
                   {
-                      Answer = lr.global == null ? (inDto.UsingOriginalData?lr.question.Answer: string.Empty)  : lr.global.Select(x => x.Answer).FirstOrDefault(),
+                      Answer = lr.global == null|| lr.global.Count()==0 ? 
+                      (inDto.UsingOriginalData?lr.question.Answer: string.Empty)  : 
+                      
+                      (lr.global.Select(x => x.Answer).FirstOrDefault().IsNullOrEmpty()&& inDto.UsingOriginalData?
+                      lr.question.Answer:lr.global.Select(x => x.Answer).FirstOrDefault()
+                      ),
                       QuestionId = lr.question.QuestionId,
                       QuestionName = lr.question.QuestionName,
                       Type = lr.question.Type,