From 297bbaadc6e239fdfe9874c1d57e463b4343f4ae Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 21 Jun 2022 10:49:57 +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

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml        | 2 +-
 .../Service/Reading/ReadingImageTaskService.cs             | 7 ++++---
 IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6e45dcc6..df9a4aae 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -4209,7 +4209,7 @@
             <param name="VisitTaskId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveJudgeTask">
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveJudgeTask(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeTaskDto)">
             <summary>
             添加裁判任务
             </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index b7ac545d..97cbe972 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -300,8 +300,9 @@ namespace IRaCIS.Application.Services
             {
                 ReadingTaskState = ReadingTaskState.HaveSigned
             });
-            await this.TriggerJudgeQuestion(inDto.VisitTaskId);
             var result = await _visitTaskRepository.SaveChangesAsync();
+            await this.TriggerJudgeQuestion(inDto.VisitTaskId);
+          
             return ResponseOutput.Ok(result);
         }
 
@@ -350,10 +351,10 @@ namespace IRaCIS.Application.Services
                             {
                                 GroupId = NewId.NextGuid(),
                                 GroupValue = x
-                            });
+                            }).ToList();
                             var itemAnswerGroupsitem1 = answerGroup.Where(x => x.GroupValue.Contains($"|{item1.Answer}|"));
                             var itemAnswerGroupsitem2 = answerGroup.Where(x => x.GroupValue.Contains($"|{item2.Answer}|"));
-                            var unionList = itemAnswerGroupsitem1.Union(itemAnswerGroupsitem2).ToList();
+                            var unionList = itemAnswerGroupsitem1.Intersect(itemAnswerGroupsitem2).ToList();
                             if (unionList.Count < 1)
                             {
                                 verificationResults = false;
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
index d2759913..79b1efaf 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
@@ -90,7 +90,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 答案分组
 		/// </summary>
-		public string AnswerGroup { get; set; }
+		public string AnswerGroup { get; set; } = string.Empty;
 
 		/// <summary>
 		/// 创建人