diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 3c97765e..10a09688 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -836,14 +836,14 @@ namespace BMA.EHR.Leave.Service.Controllers var orgName = ""; - if (profile.Child1 != null && profile.Child1 != "") - orgName += $" {profile.Child1}"; - if (profile.Child2 != null && profile.Child2 != "") - orgName += $" {profile.Child2}"; - if (profile.Child3 != null && profile.Child3 != "") - orgName += $" {profile.Child3}"; if (profile.Child4 != null && profile.Child4 != "") orgName += $" {profile.Child4}"; + if (profile.Child3 != null && profile.Child3 != "") + orgName += $" {profile.Child3}"; + if (profile.Child2 != null && profile.Child2 != "") + orgName += $" {profile.Child2}"; + if (profile.Child1 != null && profile.Child1 != "") + orgName += $" {profile.Child1}"; if (profile.Root != null && profile.Root != "") orgName += $" {profile.Root}"; @@ -1413,14 +1413,14 @@ namespace BMA.EHR.Leave.Service.Controllers var orgName = ""; - if (rawData.Child1 != null && rawData.Child1 != "") - orgName += $" {rawData.Child1}"; - if (rawData.Child2 != null && rawData.Child2 != "") - orgName += $" {rawData.Child2}"; - if (rawData.Child3 != null && rawData.Child3 != "") - orgName += $" {rawData.Child3}"; if (rawData.Child4 != null && rawData.Child4 != "") orgName += $" {rawData.Child4}"; + if (rawData.Child3 != null && rawData.Child3 != "") + orgName += $" {rawData.Child3}"; + if (rawData.Child2 != null && rawData.Child2 != "") + orgName += $" {rawData.Child2}"; + if (rawData.Child1 != null && rawData.Child1 != "") + orgName += $" {rawData.Child1}"; if (rawData.Root != null && rawData.Root != "") orgName += $" {rawData.Root}"; @@ -2193,14 +2193,14 @@ namespace BMA.EHR.Leave.Service.Controllers var orgName = ""; - if (rawData.Child1 != null && rawData.Child1 != "") - orgName += $" {rawData.Child1}"; - if (rawData.Child2 != null && rawData.Child2 != "") - orgName += $" {rawData.Child2}"; - if (rawData.Child3 != null && rawData.Child3 != "") - orgName += $" {rawData.Child3}"; if (rawData.Child4 != null && rawData.Child4 != "") orgName += $" {rawData.Child4}"; + if (rawData.Child3 != null && rawData.Child3 != "") + orgName += $" {rawData.Child3}"; + if (rawData.Child2 != null && rawData.Child2 != "") + orgName += $" {rawData.Child2}"; + if (rawData.Child1 != null && rawData.Child1 != "") + orgName += $" {rawData.Child1}"; if (rawData.Root != null && rawData.Root != "") orgName += $" {rawData.Root}";