From 6e89652f6985dbca455156ec37238aea5d581344 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 15 Jul 2022 16:29:57 +0800 Subject: [PATCH] x --- .../Allocation/VisitTaskHelpeService.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 7171c49f6..92058df45 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -157,15 +157,20 @@ namespace IRaCIS.Core.Application.Service throw new BusinessValidationFailedException("能参与读片的医生数量必须大于2,自动分配任务中止"); } - if (allocateSubjectArmList.GroupBy(t => t.DoctorUserId).Any(g => g.Count() == 2)) - { - throw new BusinessValidationFailedException("请确认是否改了配置，导致同一受试者 分配给同一个医生 在不同的Arm,无法完成自动分配"); - } + //if (allocateSubjectArmList.GroupBy(t => t.DoctorUserId).Any(g => g.Count() == 2)) + //{ + // throw new BusinessValidationFailedException("请确认是否改了配置，导致同一受试者 分配给同一个医生 在不同的Arm,无法完成自动分配"); + //} - //手动分配的时候 如果只分配了Arm1 没有分配Arm2 就会有问题 - if (!(allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))) + ////手动分配的时候 如果只分配了Arm1 没有分配Arm2 就会有问题 + //if (!(allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))) + //{ + // throw new BusinessValidationFailedException("请确认是否改了配置，或者手动分配时，只分配了一个Arm "); + //} + + if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))) { - throw new BusinessValidationFailedException("请确认是否改了配置，或者手动分配时，只分配了一个Arm "); + throw new BusinessValidationFailedException("该受试者阅片医生未配置完成"); } #endregion