From 69bfecca9c973c94f381f04e597314ddbb266ea5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 25 Nov 2024 16:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs | 2 ++ IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs index 22285d3e1..7ed96e5d2 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs @@ -174,6 +174,8 @@ namespace IRaCIS.Application.Contracts public class SelectionReviewerDTO : DoctorDTO { public int DoctorTrialState { get; set; } + + public bool IsEnroll { get; set; } = false; public string OptUserName { get; set; } = string.Empty; public DateTime? OptTime { get; set; } public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs index f9cbbbb17..ad58bc7e3 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs @@ -103,6 +103,8 @@ namespace IRaCIS.Core.Application.Service var doctorStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + var doctorEnroll =await _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup) + .ToListAsync(); result.CurrentPageData.ToList().ForEach(doctor => { //简历申请列表 --处理已经申请的 @@ -110,6 +112,7 @@ namespace IRaCIS.Core.Application.Service if (doctorState != null) { doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume; + doctor.IsEnroll = doctorEnroll.Any(x => x.DoctorId == doctor.Id); doctor.OptTime = doctorState.OptTime; doctor.OptUserName = doctorState.OptUserName; }