diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 7e5c8e33..9e757510 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1221,10 +1221,10 @@ namespace BMA.EHR.Leave.Service.Controllers //var gov_agency = await _userProfileRepository.GetOrgGovAgencyById(gov_agency_id); - var agency_name = string.Concat(item.Child1 != string.Empty ? item.Child1 + "/" : "", - item.Child2 != string.Empty ? item.Child2 + "/" : "", - item.Child3 != string.Empty ? item.Child3 + "/" : "", - item.Child4 != string.Empty ? item.Child4 : "") + var agency_name = string.Concat((item.Child1 != string.Empty && item.Child1 != null) ? item.Child1 : "", + (item.Child2 != string.Empty && item.Child2 != null) ? "/" + item.Child2 : "", + (item.Child3 != string.Empty && item.Child3 != null) ? "/" + item.Child3 : "", + (item.Child4 != string.Empty && item.Child4 != null) ? "/" + item.Child4 : "") .Trim(); var res = new GetLeaveRequestForAdminResultDto {