From 80ce27f324a41eccfee1d2b8a4927d9c414f8ea0 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 22 Jun 2023 09:24:09 +0700
Subject: [PATCH] Correct Sort and Group Report

---
 Report/Organization/rptAccount2.trdp  | Bin 2961 -> 2963 bytes
 Report/Organization/rptAccount3.trdp  | Bin 2543 -> 2546 bytes
 Services/OrganizationReportService.cs |  10 +++++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Report/Organization/rptAccount2.trdp b/Report/Organization/rptAccount2.trdp
index 072dc4d1c3fbd92e339313e9e1a1544ba8dfa9ba..d9adaad74086f70657b0eb42a8d45f6a1d29b928 100644
GIT binary patch
delta 331
zcmbOzK3QBmz?+#xgn@y9gW-+WwJ@nwi^H#RGBCW|C@#-g|4?Ffsclf1n@`O$qXyO3
zG?wl&S2CmzWeFV2+B!Y()tq}f3b-8H-dtPJn|AG#Rj+8~ffG0Vin`?HIL5F1#a;fC
zZ%$}T<FR8p)8APXu;iTfG>()A%RaIy<>}nVuO0;k?#%XcaPzypAfs<iH@oXoH$Hne
zzw0M7J3F79+*#lgl2<=P@Yso$QkEjhD*`35k1k*~Zn?*|WkuVCqs{`o*V246OZ(?I
z8ElEv+48c_ZDQf)Z-v2g?_Cy|?dIpw=6ijE=I!jg$7W2uw)d<E&z!Sdk(pJo7gp6w
ze-pJh?B<Q2njWj9<>fqS>z>#DutyDqjz3>2rvigyvJuw}UX)OoEY7XZ3>2B{$t}$&
PH#wDCjg5gDsFDEyF{zLu

delta 331
zcmbO%K2cmez?+#xgn@y9gF$1-<uHZbV%0003=FR}ipz7>C-!wm6u7z7EHkQ7jZOQ}
z<#RbhdViL{zO1bi17FR#w4>mUy>eN0iJNh7>fC8vCJ9e+)Gb}VpIxv%<ZtEfqW5RD
z>Ku}juX&ZrSTJpSx+GJFXSHck=%zR43QIpuSaHXcUqN|!u8WELxueR9ij?!^m6vBf
znZn}o`ALk0f|j`#dwuegl3tlE!7CbVTa%77N;>7UM};`Qc=WN|E!%k6lwIzAibA(^
z1a6gBFFvuO^7oFF=iX*^`6{a`9bT4wV@mFpxa0#~ukZPBv7Jjhy4qx~UQ*~j*Rr*W
zt8;QR?c8KHUbbd4zW&+%k34D+bo}{JITaWn+ZZOBab4p@36;r`-1^Kwk;&fN(u^{b
O)4A2y{&4}-G5`RQxQH77

diff --git a/Report/Organization/rptAccount3.trdp b/Report/Organization/rptAccount3.trdp
index ecf9eb3e9483518471a4ee718971e3016e13a8b3..0d91bb633a826d03f406e2134753bac3a0d98d3b 100644
GIT binary patch
delta 280
zcmaDa{7G0mz?+#xgn@y9gW;3cwXjRaN@Gkp7#Msvitl5uw^+4$;x^&5L&`f>^?tBR
zmHu?~dS>Ztp-pE){Fif1{Vc71ZLe^efA4J#@pWg6q6DR;%(?98*Y@Z73hyK5^XGW{
z6ZXzL&b`Hb(UUWQ>nxXrEY{`mHrKJ>UzT|Er9Ibmo`<I<<Xy^p`Q(!CO4Z(7OIJ-S
zUNgPBufI1)t8Lkh5Z>8lIv3q$FHBn;qTlRyGE(QHTVS`#>^Jl8&RUr@`AXO!BdLxw
z-5-S?y#F(zcw%xp$3tEe&rB}m)RzZ|bo}{JITh&HZ9psx#0XG3`7oy%TRbO71OV*r
Bb6Wra

delta 255
zcmew){9af*z?+#xgn@y9gTZ*o<uIGZ7#<@I1_rN<;``X^Gkx2)2+EzDn$z-q<;@B2
z_xfqynsOm$S(S<JiaD1pHoll^P@PrdwlgAi+QP023!cpJD>B-$-z`?DuKKadt@#mN
z7I6!Bg;dk~qRtwYO64X->`FXXX~3&}?r-3ZG>-7Lyvb$W>eq9<bThB$hW5@$-Wyp`
zlQSjA(B$Z{tQ#qsX2!R8Sf!U%y)5=Rm-N!KD{9G&l>g7J`KZobvQ22(MF*4YgZj<!
ozxYvnFu9B4AuozgCRcFkGXq5?ui}(uteSj`Q;jW#6X;<E0H(rc8~^|S

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);
             }