修改简历
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
2d2e0f6f2f
commit
7a5ad83cbb
|
|
@ -183,6 +183,7 @@ namespace IRaCIS.Application.Contracts
|
||||||
|
|
||||||
public class SelectionReviewerDTO : DoctorDTO
|
public class SelectionReviewerDTO : DoctorDTO
|
||||||
{
|
{
|
||||||
|
public bool IsVacation { get; set; }
|
||||||
public int DoctorTrialState { get; set; }
|
public int DoctorTrialState { get; set; }
|
||||||
|
|
||||||
public bool IsEnroll { get; set; } = false;
|
public bool IsEnroll { get; set; } = false;
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
#region 医生基本信息
|
#region 医生基本信息
|
||||||
CreateMap<Doctor, SelectionReviewerDTO>()
|
CreateMap<Doctor, SelectionReviewerDTO>()
|
||||||
|
.ForMember(d => d.IsVacation, u => u.MapFrom(t => t.VacationList.Any(x=>x.StartDate<DateTime.Now&&x.EndDate>DateTime.Now)))
|
||||||
.ForMember(d => d.DoctorUserName, u => u.MapFrom(t => t.UserRole.IdentityUser.UserName));
|
.ForMember(d => d.DoctorUserName, u => u.MapFrom(t => t.UserRole.IdentityUser.UserName));
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,9 @@ public class Doctor : BaseFullAuditEntity
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public List<Enroll> EnrollList { get; set; }
|
public List<Enroll> EnrollList { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public List<Vacation> VacationList { get; set; }
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[ForeignKey("HospitalId")]
|
[ForeignKey("HospitalId")]
|
||||||
public Hospital Hospital { get; set; }
|
public Hospital Hospital { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,9 @@ public class Vacation : BaseFullAuditEntity
|
||||||
{
|
{
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
[ForeignKey("DoctorId")]
|
||||||
|
public Doctor Doctor { get; set; }
|
||||||
#endregion
|
#endregion
|
||||||
public Guid DoctorId { get; set; }
|
public Guid DoctorId { get; set; }
|
||||||
public DateTime StartDate { get; set; }
|
public DateTime StartDate { get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue