From 0bd363d99c584df972f7496bf086561e9105c9b1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 26 Jul 2022 16:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskAllocationRuleService.cs         | 6 ++++--
 .../Service/Allocation/VisitTaskHelpeService.cs             | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index ba9812dc7..79e0be2c8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -42,12 +42,14 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="trialId"></param>
         /// <returns></returns>
-        public async Task<List<TaskAllocationRuleDTO>> GetDoctorPlanAllocationRuleList(Guid trialId)
+        public async Task<(List<TaskAllocationRuleDTO>,object?)> GetDoctorPlanAllocationRuleList(Guid trialId)
         {
 
             var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskAllocationRuleDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            return list;
+            var trialTaskConfig = _trialRepository.Where(t => t.Id == trialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
+
+            return (list, trialTaskConfig);
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 5bd45db7d..37bfb2fd1 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -156,16 +156,14 @@ namespace IRaCIS.Core.Application.Service
                                         {
                                             throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止");
 
-                                            //break;
                                         }
 
 
 
-                                        if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2)))
+                                        if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) || ! assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2)))
                                         {
                                             throw new BusinessValidationFailedException("该受试者阅片医生未配置完成");
 
-                                            //break;
                                         }
 
                                         #endregion