diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 1bd92859..c77bad95 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -3246,23 +3246,25 @@ namespace BMA.EHR.Leave.Service.Controllers } else if (actRole == "BROTHER") { - actNodeId = act.child3DnaId != null ? + actNodeId = act.child4DnaId != null ? act.child3DnaId.Value.ToString("D") : - act.child2DnaId != null ? + act.child3DnaId != null ? act.child2DnaId.Value.ToString("D") : - act.child1DnaId != null ? - act.rootDnaId!.Value.ToString("D") : + act.child2DnaId != null ? + act.child1DnaId!.Value.ToString("D") : + act.child1DnaId != null ? + act.rootDnaId.Value.ToString("D") : act.rootDnaId != null ? act.rootDnaId.Value.ToString("D") : ""; actNode = act.child4DnaId != null ? 4 : act.child3DnaId != null ? - 4 : - act.child2DnaId != null ? 3 : - act.child1DnaId != null ? + act.child2DnaId != null ? 2 : + act.child1DnaId != null ? + 1 : act.rootDnaId != null ? 0 : null; diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index bbf49dc8..fca7c27a 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1433,23 +1433,25 @@ namespace BMA.EHR.Leave.Service.Controllers } else if (actRole == "BROTHER") { - actNodeId = act.child3DnaId != null ? + actNodeId = act.child4DnaId != null ? act.child3DnaId.Value.ToString("D") : - act.child2DnaId != null ? + act.child3DnaId != null ? act.child2DnaId.Value.ToString("D") : - act.child1DnaId != null ? - act.rootDnaId!.Value.ToString("D") : + act.child2DnaId != null ? + act.child1DnaId!.Value.ToString("D") : + act.child1DnaId != null ? + act.rootDnaId.Value.ToString("D") : act.rootDnaId != null ? act.rootDnaId.Value.ToString("D") : ""; actNode = act.child4DnaId != null ? 4 : act.child3DnaId != null ? - 4 : - act.child2DnaId != null ? 3 : - act.child1DnaId != null ? + act.child2DnaId != null ? 2 : + act.child1DnaId != null ? + 1 : act.rootDnaId != null ? 0 : null; @@ -1911,23 +1913,25 @@ namespace BMA.EHR.Leave.Service.Controllers } else if (actRole == "BROTHER") { - actNodeId = act.child3DnaId != null ? + actNodeId = act.child4DnaId != null ? act.child3DnaId.Value.ToString("D") : - act.child2DnaId != null ? + act.child3DnaId != null ? act.child2DnaId.Value.ToString("D") : - act.child1DnaId != null ? - act.rootDnaId!.Value.ToString("D") : + act.child2DnaId != null ? + act.child1DnaId!.Value.ToString("D") : + act.child1DnaId != null ? + act.rootDnaId.Value.ToString("D") : act.rootDnaId != null ? act.rootDnaId.Value.ToString("D") : ""; actNode = act.child4DnaId != null ? 4 : act.child3DnaId != null ? - 4 : - act.child2DnaId != null ? 3 : - act.child1DnaId != null ? + act.child2DnaId != null ? 2 : + act.child1DnaId != null ? + 1 : act.rootDnaId != null ? 0 : null; @@ -2214,23 +2218,25 @@ namespace BMA.EHR.Leave.Service.Controllers } else if (actRole == "BROTHER") { - actNodeId = act.child3DnaId != null ? + actNodeId = act.child4DnaId != null ? act.child3DnaId.Value.ToString("D") : - act.child2DnaId != null ? + act.child3DnaId != null ? act.child2DnaId.Value.ToString("D") : - act.child1DnaId != null ? - act.rootDnaId!.Value.ToString("D") : + act.child2DnaId != null ? + act.child1DnaId!.Value.ToString("D") : + act.child1DnaId != null ? + act.rootDnaId.Value.ToString("D") : act.rootDnaId != null ? act.rootDnaId.Value.ToString("D") : ""; actNode = act.child4DnaId != null ? 4 : act.child3DnaId != null ? - 4 : - act.child2DnaId != null ? 3 : - act.child1DnaId != null ? + act.child2DnaId != null ? 2 : + act.child1DnaId != null ? + 1 : act.rootDnaId != null ? 0 : null;