Merge branch 'develop' into working

This commit is contained in:
Kittapath 2023-10-26 17:11:06 +07:00
commit ab538869d2

View file

@ -158,7 +158,7 @@ namespace BMA.EHR.Application.Repositories.Reports
Position = r.Position == null ? "-" : r.Position.Name,
OCName = r.OcId == null ? "-" : _organizationCommonRepository.GetOrganizationNameFullPath(r.OcId.Value, false, false),
BirthDate = r.BirthDate.ToThaiFullDate().ToString().ToThaiNumber(),
DateAppoint = !string.IsNullOrEmpty(r.DateAppoint.ToString()) ? DateTime.Parse(r.DateAppoint.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : string.Empty,
DateAppoint = !string.IsNullOrEmpty(r.DateAppoint.ToString()) ? DateTime.Parse((r.DateAppoint.Value.AddYears(25).AddDays(-1)).ToString()).ToThaiFullDate().ToString().ToThaiNumber() : string.Empty,
})
.FirstOrDefault();
if (profile == null)