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
///
///
///
- public async Task> GetDoctorPlanAllocationRuleList(Guid trialId)
+ public async Task<(List,object?)> GetDoctorPlanAllocationRuleList(Guid trialId)
{
var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
- return list;
+ var trialTaskConfig = _trialRepository.Where(t => t.Id == trialId).ProjectTo(_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