Compare commits
No commits in common. "655ef797544ca326f60d86d7fdfdfc8df8cb2af2" and "aba0101b01466fb6d6674ee5b25139d4163ca7ca" have entirely different histories.
655ef79754
...
aba0101b01
|
|
@ -21,7 +21,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.OrderBy(t => t.CreateTime).ProjectTo<EducationInfoViewModel>(_mapper.ConfigurationProvider).ToListAsync();
|
.OrderBy(t => t.CreateTime).ProjectTo<EducationInfoViewModel>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
var postgraduateList = await _postgraduateRepository.Where(o => o.DoctorId == doctorId)
|
var postgraduateList = await _postgraduateRepository.Where(o => o.DoctorId == doctorId)
|
||||||
.OrderBy(t => t.CreateTime).ProjectTo<PostgraduateViewModel>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
|
.OrderBy(t => t.CreateTime).ProjectTo<PostgraduateViewModel>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
return new DoctorEducationExperienceDTO()
|
return new DoctorEducationExperienceDTO()
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
public DoctorConfig()
|
public DoctorConfig()
|
||||||
{
|
{
|
||||||
var isEn_Us = false;
|
|
||||||
|
|
||||||
// 从 DateTime 映射到 DateOnly
|
// 从 DateTime 映射到 DateOnly
|
||||||
CreateMap<DateTime, DateOnly>().ConvertUsing(dt => DateOnly.FromDateTime(dt));
|
CreateMap<DateTime, DateOnly>().ConvertUsing(dt => DateOnly.FromDateTime(dt));
|
||||||
|
|
@ -67,8 +66,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
CreateMap<Vacation, VacationCommand>();
|
CreateMap<Vacation, VacationCommand>();
|
||||||
CreateMap<ResearchPublication, ResearchPublicationDTO>();
|
CreateMap<ResearchPublication, ResearchPublicationDTO>();
|
||||||
CreateMap<Postgraduate, PostgraduateViewModel>()
|
CreateMap<Postgraduate, PostgraduateViewModel>();
|
||||||
.ForMember(t => t.HospitalCN, c => c.MapFrom(d => isEn_Us ? d.HospitalEnt.HospitalName : d.HospitalEnt.HospitalNameCN));
|
|
||||||
CreateMap<Attachment, AttachmentDTO>();
|
CreateMap<Attachment, AttachmentDTO>();
|
||||||
CreateMap<Doctor, ResumeConfirmDTO>();
|
CreateMap<Doctor, ResumeConfirmDTO>();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,7 @@ namespace IRaCIS.Core.Domain.Models;
|
||||||
public class Postgraduate : BaseFullAuditEntity
|
public class Postgraduate : BaseFullAuditEntity
|
||||||
{
|
{
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
[JsonIgnore]
|
|
||||||
[ForeignKey("HospitalId")]
|
|
||||||
public Hospital HospitalEnt { get; set; }
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public Guid DoctorId { get; set; }
|
public Guid DoctorId { get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue