Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s

This commit is contained in:
harid 2025-12-16 11:56:49 +07:00
commit 9becd892f5

View file

@ -690,11 +690,11 @@ namespace BMA.EHR.Leave.Service.Controllers
coupleDayPosition = data.CoupleDayPosition.ToThaiNumber(),
coupleDayOrganizationName = "-",
coupleDayLevelCountry = data.CoupleDayLevelCountry.ToThaiNumber(),
coupleDayCountryHistory = data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
coupleDayTotalHistory = data.CoupleDayTotalHistory!.ToThaiNumber() ?? "",
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory!.ToThaiNumber(),
coupleDayCountryHistory = data.CoupleDayCountryHistory == null ? "-" : data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
coupleDayTotalHistory = data.CoupleDayTotalHistory == null ? "-" : data.CoupleDayTotalHistory!.ToThaiNumber(),
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "-" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "-" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory == null ? "-" : data.CoupleDaySumTotalHistory!.ToThaiNumber(),
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),