diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 5b8df9988..0ff2820ca 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1094,6 +1094,11 @@ 名称 + + + 下拉ID + + 临床级别 diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs index 9bacbbbab..a5d761a1b 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs @@ -74,7 +74,11 @@ namespace IRaCIS.Core.Application.ViewModel public class TrialDoctorUserSelectView { - public Guid DoctorUserId { get; set; } + public Guid TrialId { get; set; } + + public ReadingMethod ReadingType { get; set; } + + public Guid? DoctorUserId { get; set; } public string UserCode { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs index 7b380cde5..ddfd69b87 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs @@ -82,9 +82,18 @@ namespace IRaCIS.Core.Application.Service { var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId) join user in _userRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId - select user; + select new TrialDoctorUserSelectView() + { + TrialId = enroll.TrialId, + ReadingType=enroll.Trial.ReadingType, + DoctorUserId= user.Id, + FullName=user.FullName, + UserCode=user.UserCode, + UserName=user.UserName, + UserTypeEnum=user.UserTypeRole.UserTypeEnum + }; - return query.ProjectTo(_mapper.ConfigurationProvider).ToList(); + return query.ToList(); }