XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Uat_Study
hang 2022-07-26 15:07:05 +08:00
parent 3f8ec97a02
commit 5b32340594
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
View File

@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? Id { get; set; } public Guid? Id { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid EnrollId { get; set; } //public Guid EnrollId { get; set; }
[NotDefault] [NotDefault]
public Guid DoctorUserId { get; set; } public Guid DoctorUserId { get; set; }

12
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -154,14 +154,18 @@ namespace IRaCIS.Core.Application.Service
if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable && t.IsJudgeDoctor == false).Count() < 2) 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))) if (!(assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && allocateSubjectArmList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2)))
{ {
throw new BusinessValidationFailedException("该受试者阅片医生未配置完成"); //throw new BusinessValidationFailedException("该受试者阅片医生未配置完成");
break;
} }
#endregion #endregion
@ -394,7 +398,9 @@ namespace IRaCIS.Core.Application.Service
{ {
if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable).Count() < 2) if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable).Count() < 2)
{ {
throw new BusinessValidationFailedException("能参与读片的医生数量必须大于2,自动分配任务中止"); //throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止");
break;
} }
//配置了医生 //配置了医生

4
IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs
View File

@ -31,9 +31,7 @@ namespace IRaCIS.Core.Domain.Models
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;
public Guid EnrollId { get; set; }
public Enroll Enroll { get; set; }
public Guid DoctorUserId { 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; } public bool IsJudgeDoctor { get; set; }