From bbb08f752789a1e47f21215616ca461d591a9d23 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 9 Dec 2022 17:41:51 +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

---
 .../ReadingCriterion/ReadingQuestionService.cs   |  7 +++++++
 .../ReadingImageTask/ReadingImageTaskService.cs  | 16 ++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index b39163423..285b2e532 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -643,6 +643,13 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit indto)
         {
+
+
+            if (await _readingTableQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId==indto.ReadingQuestionId))
+            {
+                throw new BusinessValidationFailedException("问题编号重复");
+            }
+
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 129930c06..127725f28 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -589,19 +589,15 @@ namespace IRaCIS.Application.Services
                     qusetionList = qusetionList.Where(x => usedGurops.Contains(x.GroupName)).ToList();
                 }
             }
-           
 
 
-            if (inDto.TaskId != null)
+
+            var answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.TaskId).ToListAsync();
+            qusetionList.ForEach(x =>
             {
-                var answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.TaskId).ToListAsync();
-                qusetionList.ForEach(x =>
-                {
-                    var answer= answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
-                    x.Answer = answer.IsNullOrEmpty() ? x.DefaultValue : answer;
-                });
-
-            }
+                var answer = answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
+                x.Answer = answer.IsNullOrEmpty() ? x.DefaultValue : answer;
+            });
 
             #endregion