diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index e895bc75..4bcaeb4a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1745,7 +1745,7 @@ namespace BMA.EHR.Placement.Service.Controllers dateStart = r.commandDateAffect, govAgeAbsent = 0, govAgePlus = 0, - birthDate = p.DateOfBirth == null ? (DateTime?)null : p.DateOfBirth, + birthDate = (p.DateOfBirth == null || p.DateOfBirth == DateTime.MinValue) ? (DateTime?)null : p.DateOfBirth, reasonSameDate = (DateTime?)null, ethnicity = p.Race == null ? string.Empty : p.Race, telephoneNumber = p.Telephone == null ? string.Empty : Regex.Replace(p.Telephone, @"\D", ""), @@ -1775,13 +1775,13 @@ namespace BMA.EHR.Placement.Service.Controllers duration = e.Duration ?? string.Empty, durationYear = e.DurationYear ?? null, field = e.Field ?? string.Empty, - finishDate = e.FinishDate ?? null, + finishDate = (e.FinishDate == null || e.FinishDate == DateTime.MinValue) ? (DateTime?)null : e.FinishDate, fundName = e.FundName ?? string.Empty, gpa = e.Gpa ?? string.Empty, institute = e.Institute ?? string.Empty, other = e.Other ?? string.Empty, - startDate = e.StartDate ?? null, - endDate = e.EndDate ?? null, + startDate = (e.StartDate == null || e.StartDate == DateTime.MinValue) ? (DateTime?)null : e.StartDate, + endDate = (e.EndDate == null || e.EndDate == DateTime.MinValue) ? (DateTime?)null : e.EndDate, educationLevel = e.EducationLevelName, educationLevelId = e.EducationLevelId, positionPath = e.PositionPath?.Name ?? string.Empty, @@ -1793,8 +1793,8 @@ namespace BMA.EHR.Placement.Service.Controllers bodyCertificates = p.PlacementCertificates.Select(e => new { profileId = string.Empty, - expireDate = e.ExpireDate ?? null, - issueDate = e.IssueDate ?? null, + expireDate = (e.ExpireDate == null || e.ExpireDate == DateTime.MinValue) ? (DateTime?)null : e.ExpireDate, + issueDate = (e.IssueDate == null || e.IssueDate == DateTime.MinValue) ? (DateTime?)null : e.IssueDate, certificateNo = e.CertificateNo ?? string.Empty, certificateType = e.CertificateType ?? string.Empty, issuer = e.Issuer ?? string.Empty