diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index 712449a2..5fca5107 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -274,7 +274,8 @@ namespace BMA.EHR.Application.Repositories.Reports { if (retire.TypeReport == null) { - profile_retire = profile_retire.OrderBy(x => rootOrder.ToObject>().IndexOf(x.root)) + profile_retire = profile_retire + .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject>().IndexOf(x.root)) .ThenBy(x => child1Order.ToObject>().IndexOf(x.child1 ?? "")) .ThenBy(x => child2Order.ToObject>().IndexOf(x.child2 ?? "")) .ThenBy(x => child3Order.ToObject>().IndexOf(x.child3 ?? "")) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index d0290010..6aca09a7 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -331,7 +331,8 @@ namespace BMA.EHR.Retirement.Service.Controllers } } var order = 1; - foreach (var profile in profiles.OrderBy(x => rootOrder.ToObject>().IndexOf(x.root)) + foreach (var profile in profiles + .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject>().IndexOf(x.root)) .ThenBy(x => child1Order.ToObject>().IndexOf(x.child1 ?? "")) .ThenBy(x => child2Order.ToObject>().IndexOf(x.child2 ?? "")) .ThenBy(x => child3Order.ToObject>().IndexOf(x.child3 ?? "")) @@ -1346,7 +1347,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var order = 1; foreach (var profile in retire.RetirementProfiles - .OrderBy(x => rootOrder.ToObject>().IndexOf(x.root)) + .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject>().IndexOf(x.root)) .ThenBy(x => child1Order.ToObject>().IndexOf(x.child1 ?? "")) .ThenBy(x => child2Order.ToObject>().IndexOf(x.child2 ?? "")) .ThenBy(x => child3Order.ToObject>().IndexOf(x.child3 ?? "")) @@ -1361,7 +1362,7 @@ namespace BMA.EHR.Retirement.Service.Controllers order = 1; foreach (var profile in retire.RetirementRawProfiles - .OrderBy(x => rootOrder.ToObject>().IndexOf(x.root)) + .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject>().IndexOf(x.root)) .ThenBy(x => child1Order.ToObject>().IndexOf(x.child1 ?? "")) .ThenBy(x => child2Order.ToObject>().IndexOf(x.child2 ?? "")) .ThenBy(x => child3Order.ToObject>().IndexOf(x.child3 ?? ""))