Compare commits

..

No commits in common. "bdaa9974163e20ad094997b53b5c55e214013cf9" and "8d8865cef781fdb6182ece2b6c7b8b60f0c00e63" have entirely different histories.

3 changed files with 5 additions and 9 deletions

View File

@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
[HttpGet("{trialId:guid}")]
public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
{
var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId /*&& t.TaskAllocationRule.IsEnable*/ && /*(t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup ||*/ t.Trial.VisitTaskList.Any(v => v.DoctorUserId == t.DoctorUser.Id))
var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
select new TrialDoctorUserSelectView()
{

View File

@ -19,10 +19,6 @@ public partial class Enroll : BaseFullAuditEntity
[JsonIgnore]
public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; }
[JsonIgnore]
public TaskAllocationRule TaskAllocationRule { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid TrialId { get; set; }