diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs index 66ceee7ee..51a95fca2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs @@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? Id { get; set; } public Guid TrialId { get; set; } - public Guid EnrollId { get; set; } + //public Guid EnrollId { get; set; } [NotDefault] public Guid DoctorUserId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index ce267b4d4..dc0f00b64 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -154,14 +154,18 @@ namespace IRaCIS.Core.Application.Service if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable && t.IsJudgeDoctor == false).Count() < 2) { - throw new BusinessValidationFailedException("能参与读片的医生数量必须大于2,自动分配任务中止"); + //throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止"); + + break; } if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))) { - throw new BusinessValidationFailedException("该受试者阅片医生未配置完成"); + //throw new BusinessValidationFailedException("该受试者阅片医生未配置完成"); + + break; } #endregion @@ -394,7 +398,9 @@ namespace IRaCIS.Core.Application.Service { if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable).Count() < 2) { - throw new BusinessValidationFailedException("能参与读片的医生数量必须大于2,自动分配任务中止"); + //throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止"); + + break; } //配置了医生 diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index d0db57051..03af13ce2 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -31,9 +31,7 @@ namespace IRaCIS.Core.Domain.Models public string Note { get; set; } = string.Empty; - public Guid EnrollId { get; set; } - public Enroll Enroll { get; set; } public Guid DoctorUserId { get; set; } @@ -46,7 +44,9 @@ namespace IRaCIS.Core.Domain.Models + public Guid EnrollId { get; set; } + public Enroll Enroll { get; set; } //是否是裁判医生 裁判医生单独加入 public bool IsJudgeDoctor { get; set; }