From 57bb9e5bba49cd56120a504d6d3324b1d406e4e6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 1 Nov 2022 11:11:14 +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/Dto/ReadingImageTaskViewModel.cs        | 2 ++
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs     | 2 +-
 .../Reading/ReadingImageTask/ReadingTaskQuestionService.cs  | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index fe8891a71..632b9d98d 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1705,6 +1705,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsPage { get; set; } = false;
 
+        public string DefaultValue { get; set; } = string.Empty;
+
         /// <summary>
 		/// 标准分页Id
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 963e5d4b6..0ee9f7e52 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -412,7 +412,7 @@ namespace IRaCIS.Application.Services
 
             qusetionList.ForEach(x =>
             {
-                x.Answer = answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
+                x.Answer = answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? x.DefaultValue;
             });
 
             #endregion
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
index 911474599..690e92cda 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
@@ -164,10 +164,16 @@ namespace IRaCIS.Application.Services
                             PageName = leftpage.PageName,
                             PageShowOrder = leftpage.ShowOrder,
                             IsPublicPage = leftpage.IsPublicPage,
+                            DefaultValue = data.DefaultValue,
                         };
 
             var qusetionList = await query.Where(x => x.ShowQuestion != ShowQuestion.Hide).OrderBy(x => x.ShowOrder).ToListAsync();
 
+            qusetionList.ForEach(x =>
+            {
+                x.Answer = x.Answer.IsNullOrEmpty() ? x.DefaultValue : x.Answer;
+            });
+
             return qusetionList;
         }