diff --git a/Report/Organization/rptAccount2.trdp b/Report/Organization/rptAccount2.trdp
index 072dc4d..d9adaad 100644
Binary files a/Report/Organization/rptAccount2.trdp and b/Report/Organization/rptAccount2.trdp differ
diff --git a/Report/Organization/rptAccount3.trdp b/Report/Organization/rptAccount3.trdp
index ecf9eb3..0d91bb6 100644
Binary files a/Report/Organization/rptAccount3.trdp and b/Report/Organization/rptAccount3.trdp differ
diff --git a/Services/OrganizationReportService.cs b/Services/OrganizationReportService.cs
index 478fee8..b4e5a8d 100644
--- a/Services/OrganizationReportService.cs
+++ b/Services/OrganizationReportService.cs
@@ -337,7 +337,7 @@ namespace BMA.EHR.Report.Service.Services
                                join ptNew in positionTypes on rp == null ? pm?.PositionTypeId : rp?.PositionTypeId equals ptNew?.Id into ptNewGroup
                                from ptNew in ptNewGroup.DefaultIfEmpty()
 
-                               join orgOrder in orgWithOrder on op.OrganizationId equals orgOrder.Id
+                                   //join orgOrder in orgWithOrder on op.OrganizationId equals orgOrder.Id
 
 
                                select new
@@ -369,14 +369,14 @@ namespace BMA.EHR.Report.Service.Services
                                    PositionExecutiveSideOld = rp == null ? (pes == null ? null : pes.Name) : rp.PositionExecutiveSideOld,
                                    PositionExecutiveSideNew = pesNew == null ? null : pesNew.Name,
                                    Remark = op.PositionUserNote ?? "",
-                                   OcOrder = orgOrder.Order,
+                                   //OcOrder = orgOrder.Order,
                                    PositonTypeOld = rp == null ? (pt == null ? null : pt.Name) : rp.PositionTypeOld,
                                    PositionTypeNew = ptNew == null ? null : ptNew.Name,
 
                                })
                                .ToList();
-                               //.OrderBy(x => x.OcOrder).ThenBy(x => GetPosnoIntFromPosNo(x.PositionNumberOld))
-                               //.ToList();
+            //.OrderBy(x => x.OcOrder).ThenBy(x => GetPosnoIntFromPosNo(x.PositionNumberOld))
+            //.ToList();
 
             var results = new List<Account2ResultItem>();
 
@@ -438,7 +438,7 @@ namespace BMA.EHR.Report.Service.Services
 
                     Salary = salaryRecord == null || salaryRecord.Amount == null ? 0 : (int)salaryRecord.Amount!.Value,
                     SalaryPosition = salaryRecord == null || salaryRecord.PositionSalaryAmount == null ? 0 : (int)salaryRecord.PositionSalaryAmount!.Value,
-                    OcOrder = r.OcOrder
+                    OcOrder = orgWithOrder.Where(x => x.Id == r.ocIdNew).FirstOrDefault() == null ? 0 : orgWithOrder.Where(x => x.Id == r.ocIdNew).FirstOrDefault().Order
                 };
                 results.Add(data);
             }