From b753901b95a70700ad435857a44b9977ed7b9ce8 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 5 Jul 2024 13:58:00 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=81=E0=B8=A9?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=93/=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandRepository.cs | 11 +++++--- .../Controllers/RetireReportController.cs | 24 ++++++++++++------ .../Reports/31-ประกาศเกษียณข้าราชการ-1.trdp | Bin 28967 -> 28969 bytes .../Reports/31-ประกาศเกษียณข้าราชการ-2.trdp | Bin 28984 -> 28987 bytes .../Reports/31-ประกาศเกษียณข้าราชการ-3.trdp | Bin 28963 -> 28965 bytes .../Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp | Bin 28996 -> 28998 bytes .../Reports/32-ประกาศเกษียณลูกจ้างประจำ-2.trdp | Bin 28982 -> 28982 bytes .../Reports/32-ประกาศเกษียณลูกจ้างประจำ-3.trdp | Bin 28995 -> 28997 bytes 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index f2c6a86f..5ad7eb00 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -9158,11 +9158,14 @@ namespace BMA.EHR.Application.Repositories.Commands var raw = JsonConvert.DeserializeObject(apiResult.Result); if (raw != null) { - ret.Add(new KeyValueItemResponse + if(raw.result!.rootId != null && raw.result!.root != null) { - Id = raw.result!.rootId ?? null, - Name = raw.result!.root ?? null, - }); + ret.Add(new KeyValueItemResponse + { + Id = raw.result!.rootId ?? null, + Name = raw.result!.root ?? null, + }); + } } } // var rootOcId = await GetRootOcIdAsync(UserOrganizationId); diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs index 6b3ca3d7..2126178b 100644 --- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -118,25 +118,33 @@ namespace BMA.EHR.Report.Service.Controllers { _count++; } + string position = profile.GetType().GetProperty("position").GetValue(profile); + position = position != string.Empty && position != null ? position : "-"; string thaiOrder = profile.GetType().GetProperty("order").GetValue(profile).ToString(); thaiOrder = $"ลำดับที่ {thaiOrder.ToThaiNumber()}"; + string thaiPosNo = profile.GetType().GetProperty("posNo").GetValue(profile); + thaiPosNo = thaiPosNo != null ? $"(ตำแหน่งเลขที่ {thaiPosNo.ToThaiNumber()})" : $"(ตำแหน่งเลขที่ - )"; + string organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + "/") + + (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + "/") + + (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + "/") + + (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + "/") + + (profile.GetType().GetProperty("root").GetValue(profile) == null ? "" : profile.GetType().GetProperty("root").GetValue(profile)); + string reason = profile.GetType().GetProperty("reason").GetValue(profile); + organizationOrganization = organizationOrganization != string.Empty ? organizationOrganization : reason != string.Empty ? reason : string.Empty ; + reason = organizationOrganization == reason ? string.Empty : reason; _profileList.Add(new { count = $"{_count.ToString().ToThaiNumber()}.", no = $"{(_profileList.Count() + 1).ToString().ToThaiNumber()}.", order = thaiOrder, - organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + "/") + - (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + "/") + - (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + "/") + - (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + "/") + - (profile.GetType().GetProperty("root").GetValue(profile) == null ? "" : profile.GetType().GetProperty("root").GetValue(profile)), + organizationOrganization = organizationOrganization, fullName = $"{profile.GetType().GetProperty("prefix").GetValue(profile)}{profile.GetType().GetProperty("firstName").GetValue(profile)} {profile.GetType().GetProperty("lastName").GetValue(profile)}", - position = profile.GetType().GetProperty("position").GetValue(profile), - posNo = profile.GetType().GetProperty("posMasterNo").GetValue(profile), + position = position, + posNo = thaiPosNo, oc = profile.GetType().GetProperty("root").GetValue(profile), positionEmployeePosition = profile.GetType().GetProperty("position").GetValue(profile), posNoEmployee = profile.GetType().GetProperty("posMasterNo").GetValue(profile), - reason = profile.GetType().GetProperty("reason").GetValue(profile), + reason = reason, }); } diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp index 6cda9c7f021af85fed3fd510f27be077a928227c..cf9b3a60a3e49f2fa52bd54f2415a22a45522127 100644 GIT binary patch delta 1765 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 delta 1818 zcmV+#2j%#?;sLng0S!<~0|XQR000O8AduLx4U=dMAduKtp7YpHjs^e#+>@(*DDdCr$8xoj8fxjs!&8aS@kAbph@15FZk2jvd*~C`^^s4XH3~4;wI)At4on z*hNT#jm`Nt{we#;XP?+{PLj528Lg`J_&eYIc5e048(oKd$^5|f+=fzCOA29b%d>2^ z-B9}B%@d2t=~EwmP+wy`&kxCU+kXl>fM>M23b{hNtf5rOCv=6F9q*Ru(%w1Wwi?R1 z-)9N|)^5;HI$_xRMAL#+hjnS7hRk8U{e{}{x|)w%L6)YM^opjdWd(#0Qa8if4#OdQ zob}u=6}En!nAE2?`fk&_2vY4kjBC>i6{01ST1HyG5VCF{xU8~}+K$OuA%B=k&NI8+ z2^)%D$}F++7^x;mn%8E}8X{~&*+$5nGM0Fw;HgGtacN|4MXmBNI;)|? z(UUlO9!G!1(N-M2iKAcR=x!W6K**~&8pKhAQ_t~tN1(y@cN_rZbsYT=N8iN5`(g_I zewV{c$brvxJp4M29>>vBB>V#r1}L$}@Z*m*R!_p8GbfP-rvHtH_kU2QZ4wW+I9Cuj zyvrpY1tY%YsGR!&%iuViA<6Q{u78Olm{{(@4rkon*E2|j&`gXaP= z#PNf8_`VyTj^&f3he z0`+r7{Y`QV1>Hx35`SwFvz{F%3R$79+3{`n3(;nidJB_6smjWf@G3gv*llR>E6fd< zuN-9MrZt*}nH}0=qG)SLJ&LL=sd`qmHMKITTO%1KS_GVfF16+wgVqIYEVbyeZCMUG zK#PR_yeAg9Ub0=57`JNs$x6{sKD{nsD&deq_t4+Uvi@eMOMiN2-1S?yqUi0CZeAumLPDL#mOR}0;QcJoqtEhNf2KgmA zmmoVBfCJCOw0|h}m6E$kr%67uo5w@cY#SjjP_s9fJ}+?a3V*j|XqjZ)Kj;Qgz(-`C zb7VV?e0TF+?P>PVi$)nZz}mP!uOmrME$_S|(HqWaGgPiYr_slIQmwWq>q%u@tyXg< z?U3^+TD0t0w~P9(FvkfBK%obpBWvER3$DdBKpJ?^bAS3>H~WT3vq!-%`HIh*eaGPe*qm2+OL9jat}FFJcBP@#O67gKvgZXhKQL_O z09U-t%zx8u>e_cGNBJx_9wGRQ2Jl&Iais(GbX}8mk9y)tNmEHCCdzwKqXOnAE9YX4 zoL)Gn?eZd5iCF#(E^=y!6PGyLnGr*@ApA zm*)3q67&2j^nc&6T_)C|X^Z?cR@0aN*?n|hxn0?90%l>^b%tjo(lnoyxHEEWN;0Js zGk=cX6L){P8~gm-UwJ`Y$}O44iiS@8IX-VABE3W0eY2E5=p@GP>pr5QRu>kh`Xs&b zOMH^QkeECfljO8Dafc?h3nuJ(S7|tZt7iP49;$0&uXNhjGhOzjMpG&_uif&?LJ{rvmjgx{Lf;%~AdOSrFv zVsoAvP3C|zJ%6lj`Ng!DAj#Vw4-9woG7Sp-Q-*y$>^f;E3(^bXQhi3|rQewY(kA7l z2^rO8a6lUo7T_ZJKz#PtE1?y@Q~v=_O9KQH0000803eXqlYDRP10aytlWlNE4Iq%% zSf2CPP>u!w0Nj(oa4#Pqkl0v;G{v2w0002*0000J0000000000000000Bn;FaV7>^ IZ~y=R0J7?E(EtDd diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp index f95594e5fb6b272d442909ad20035fd576393cc3..30f912dd0d34d87c086e386be915ad706371ce8f 100644 GIT binary patch delta 1757 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 diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp index 255a0435a6058e28ba7afbe3eba72a610188d6ca..e84590163e708f9dea51e611202c9ff320381a7c 100644 GIT binary patch delta 1796 zcmV+f2mAQM;sM6u0S!<~0|XQR000O8VpZj_4U=dMVpZi>n_t1toCW{@T9d74L4UC0 z+$jl&-Q^}Ojn)gOk3%vf7LFa+PFbjsN{h5hFHaPqEfNxos?t_SWhvD8H~uL-bL@#P znIxOttSVNk-SN!1e&;eXcH_)u-y&Z#*E1cvspx7!Aulh-KDlXj{2tI%+kJ&xqkYy?N`Lx^l0uB0bJwux;DT#*n#zVdWC{V%w%1g8zCZXv z)4X<%^{J=&%wn#2M{PTO%|)r8ODh(NC9SCH3MeC_VfgnfhC_Hb@7R8VJthoitT! z4YH>#TG%RN(6S;j*5O3UZ2Lo(tvH+HQlEA~hKBz=Z7^QZ)f?0rGPQN>f+C_(;^qs7 z@Zk!(4a2Hh;SU?mps5u22n@rx8f|K^mg^w+j!i9vTs8Y_{{>3eL9RW)m34))zYy~gLNM4x;gOJEQS3wX<{x|nW8UN7m6#df_(?eWDe>}H zB7iFa0e>LhE(Rmfb3Af>Csq(!9O>8+`Xc9FBGVHBCaVxwm3(vFWLC#hzhcyVppaE+ z8$H*w?})AxrKTU{RDW5P(S#@5S5YH~q3~DFKvTjgO>*ZpqBM{k782o~%_B$rw5^L_qFn{=fb-jhF?+;&6XaJb; z6m5HhlIK@8S)l$vG_)u#5qx`ynzj*|x2WS8=NoMkJ)#T{uRRq1a!M@{)cHIdZJ~sx zvAH8)c}|4(*Qj6@AKxL}9y;_?w9Q9o1dg#q2o=%x4oW!n2ef+m?UNj!f0DyTd!e{( z3*Z2zopA&<9Dko8I+0bonCu+tC>RjS$Mbq+WnQo3MR(MlGFSc+y|S9_mF02$>m{{Z zO*epJ(heZ|IX({;Y0uq14D!?B!65-xE7L*I)mj3Iu2u@O&q*ZOS|`e0q?G}IU!y*o zyU~{ZZ;*qx$)PG2$yxDB)@C>gi~`z&p{^e>>NT}kE*=>5 z+e6FZh=0$mwUcsWj~2V)5o1?X3l;sq*bN-dJ8qZS=6%Z9zD$iJ zq%NZ#EabwV7nT}_h9>JLjRBTrU2vAz&>Q5q&~mYEHlH|?&}1F3gEnLn8M2>!(?)!|3KPw_L zo83M(=W3xgwbf;sPEEcGOEY%7h?#pG`nYSsZC&gs({|@+qNeZLvpe2_vbD5mN==Ra zRDTtf!^Tmv-Dl%y+9Hm8ls{y(CpHu~2XpMB$pZ&^#j(b(=s%jEC)FiwJ+y@t z{qt zY|ck6gINHk<7R@u-|~tD5`A^zxyFHBplXh@N4PsU0 mSeswL&zuGT09upEa4!R5RppcXa2o-7lNfO(25E2r0001RsAt~* delta 1794 zcmV+d2mScQ;sM0s0S!<~0|XQR000O8xsceg4U=dMxscdcRG|wJd>?xL4WWq zS4sk6ce#m6qxAynqe+Iu!m%UUDGL=+X_0p6<%uG+MM7dxRoV)vEQLD%#y_QJjy<;H zOp?uRRu!w&?s(>0zjK)xyK!c-ZOC4cQiNg_tiy=yq;;DTp$n$m_hq!Izqj^C7eK`{72 zQT%p~_Dx?7s7*cVj@)+piic7`m!hkBNzr9Z0%e3WjNqP4aR?9RT_;GCZCoUV>6y2N zPRqCqTCMw(Su+SEqQsm^#@e_P(7w;5tkJ-VKIxojg@y z4YKDgTG%RNP{u`!S%(uXs~rqIy5eq7Mv(PO>@e}BkP#_S+xD;j+p zh0mh!1v37H1Usm)DDd;oHrGzUpR=cs2bTYhM%!r97KujRGj68vw|^)cp@wa)e=Fw` zFudEh{ud}=2f6k**SIT;{RN+o5rV-k3Xg^Sieew4H~-)x81o(nulURe$4{csPnnm; zG675p2>1i}b}<;4p5w9eJBfnC;#kKP*B3kg5}BS5Fjv{`U-ygoD&;T&w zDcbf1CC{&HvOxWTXlPMPBKY)5?IrubBaz zyU~{ZZ;;GecDloA6}c8?LwXI6%UbT_tjemEZM1c{T7Sx2cmgJ>cobf7JNJt2tWw+d z3zOUwwno<7yO*2}-2{bzpKA~MPWB9o#=wNKD)F`WQ7e`h3XSh)>`Eb6olFuP%HiaA zlGN3zXy;UO`N5;^dL7EnR$~#ai|oo`EjUyaA~`F5+1d<8fssRdFx0gpM!hEMW&OaY z-yYgFLw|g3t(_Djd$ic;M~q!nRx8?pu^YI)#g3j2aue6w2U$XQO~<-#GLkQI#tU zUZAU14nqe~C>qmHCi*mZ>^amc?kY=uwGrEV!GCjyg9*qm9dK#v9aJ_wSw4-`o@IB0 z;>04mC`X*EVq$F}YF!v6WtN!@oVT2=&;!0G6g!PGDJ@(s1VoH}lJ5JAOE4=UGuzod zw%@8+o7&9Anodo;&k8d(UBt}24xQSw;XclHjcNPuG*Q!c=Gh(ZK-pSaG^M6Sf2xYg zVSnQ&*wDx0XgNHNY*ai(wI?T;s|5k_|5ZDK}8pVGP$j@)OLv9CbN*k_>lGf|GB(K5T#paJ_P<&%~?n;SOg zGnPSZ0Mqrxg23M6@&yuqS7N!wfL<~ELavIaF9v-($)V<_610bpE79^b3 z`V_96DPv)tAM8MV_Aybw%O_9&2T)4`1QY-O00;oNkl2%lZ|(!Rkl2%Wa7PWfkl0vM kp$kZw1^@s&lgw~01G$jclm2iU0eF)daV7?5Z~y=R0Im>evj6}9 diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-2.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-2.trdp index 277ae39def6a1af2cf45be5338fe3450315dd97f..04da3d35f8a80d2123e3eec5facb22e6b8ca2ee1 100644 GIT binary patch delta 1784 zcmVu=LW{QIQ+4<}EW-~)Ezw4oUeh_>S)9*gP%+Q%b45(~$+Y-bdvO6!JHn6@tihB73i zg3w+<8f0D|$`S)v7{;A!L}*U5CJs zPR@C5lnUFtfJ_|Vn|-%sUZPU%dxUA@M+(w7rIwKz7bDUO1($UaVcRiDJEDK4q6@_C zbfc!CS29biJVvSskmj}7w?;sqjk6fj3>I2;JL(5y)!RZBd$>b+Xz)MO{1K$8UdK+K zsI9B#6%mOVQ(qVZlgs259oE%lHre$2rUE8X#UQ3;8#|;Gc;I-?#g2lm*gdj&*QYXV zCQ|d=j&Mm%xRO&>;*%ME(Z+wNwUSG<%mex5O|lg+r;H`uD0pf;v$!&{x27(!F*vKK zB=NH(ewoC7B=JrXzfIy_lK6fSKZ2FlNjym67(g%KcTb?v@ozAoD{qqc`y~E489o#s z`uE!$CMTzSc9Y>(N&Ga4p9A6VfG_}wMTQ@Lw6%VU{yBRJXejufWcYsoblOG9aEEcF z0*CjR+szq3P5g5)VGM^c8~~HIg2}iUjN5au&b>niFF+RO z`4dRl0p@?fl<;bqYs8I6pd4fgr^T9IGrQO)qI#EkVT$stsCrhu%W7>@z;!<6T7-;) zF16-5p*@WDv(%z1wq-fw04);wv*uXjdf9dfH*Vby_?FRBKD~b-VJhK}uI{7JRb`E? zt~T^sr$dFGBz_{Q=YQHg5cCRK6FzG8${Q|fRu@{H)rD9}A9fF#QCchYhOD?6 zYDKS4t1cFoL4JSJ&Lzkm1mN&eGA)yZa&xY{D)X7%P9B41yRh;KG zmOTCb1~-V3J|ah;qu+z%2cP%QgQlE!_R*e3xj29-c{r;{Nv}5Vxk;6dN_F{Bsd`dv zz^b z_tf6Ed+<$Xbg-^2t989mxEinI&x~rNnoAm;pS)9p7^h+lta{enqBU#8al*o)(1gLz zhIi+pYmqG~kGjuu`aL(BQ=sW%T1`s=#;4U{WdT$Ey@`D$kwDAYLCvjH$L+5*q-W+z zE(TD3w{m@-mThbSHrSF9{yMAtGUn+8-tDa=t3p&`f?_oyvS#B&r4G0b? zptxmL4m1viChIK*ceJGCa6qZ}%Ni9hM>#tOW*UEzA|_Q;s+B=AM4~BO&F@$zmnKLr z;MFH-S;VW&g;!fyk=s&I+R#d!pL!;6Nl@IT4)_Bw*ZF+l_5G4-A#DIO_N6{sE*GJ( z*0mi=%1+L*1AOF3Ek~~I3tQh8_L4NH+BBmKShwAd)LsFUvYkYk7A$}Z;giQIEuuN2 z7)^hR-_#abIvkeHKNVG%-s*GDJ!vaDDc|a)`8@(co?oN8L*Uph5j)kSBfun9lMe^e z`{+WsU7I%nv#`va;TefE&8H>qlpLFoOesa~ac%6KPaAvaOCJR@45NiR#3T`WbqrAp z`y{wzyH-;v5iM-7S6y*oViymg z*o?KoAs#)ce?r=zrUSH_| delta 1784 zcmV8ErBnH}%0>0D|$`S)v7{;A!L}* zwnLyvI~P1RN`-A+LM9IIt)AO7FH@=ZJ;Jo{BL!)ErIsx<)+5pl1(!7vVcUN(Nh_kJ zqD#bXccO-(S29biJVmMrEX`|kV2xmbHp*f|GZ<*vt*94}6>kfzcX6BY(BOZl`NNs2 zdILK>qBgHxRD>sLOnqStbgq!wv{_ddS!dJp8w!|66$77|E$onH-~sTSiyZ}BwYy|< z+ov*ZCQ|d=wtyrjT*;{`!DN35F52j7tpur-A&?*5BwG;!WhC&1&Qt4|#g(DGHFbft z0j!3S#LtrWWfK39#JfrSHi>^p;`>Sb2u5BfaX*P;n0g7n`+|(Ne}e`cd6UH7C-K+G z;GvkJf4|L9^5vAzUNZP9iJvC%b6EI05cEM}k>ST5ZLOW5f6kwQHFSUapJea=blOA7 zV3%>F0tfe*+she1P5g5{VT^_`>;sdxg2|{EjN5ZD&e5Tb z7a)uC{0XG&0`tG1OLcn(jhA9%0PRP~;JeJi6Bz?0gfjRQ*1Z5nWO7a-z@ncDNHyj% z_Jll+#Xc;0gs93Yb*g`gzPw-)#|qWY2@ZD92@v!U4C2;svtFD;3R=ak*$Hg-j;Oah z@gklv3$lDgES=6fcAM7vRpLe@P!2PN(`3z$nH}sCk-dvNF-7`TR6R@IMYT3e;5u(} zEkedYms)d!&>BYTS!&T$+p-*Th!zR`S#d0Ky<)qB8@FZ$e9M1mD4*VxFqLpfM-Ncw zs+0jqsTG@e|2KJz3Q z{Fn?LqvKz6o=J-i`tNIvz^D)2=nrQ%y$CyOIxRg2NZxQ!)2h(ov?|0x`lxHrl+;?P zFUyi^S*_^xN!fqJ{L;^F+PMJP2L~KoNTz8rS8UD{S7knv%gJNVY!60Wfo5+Zj$T3I zHT>>Q(2|GW-vEP1>0@#PI{r0Ce(-q@HE6j+#l84iZl=N!zo{LoJs8p99 zm8z%Jyh5cxvw(9(>Cg9;~a2YQ0vt8879JjB2Htiy56Cyij$QG4H(es>M*UkEL()2M+rUfy_yVYW10aO0DiG3xJ%$9?Lnp>%k+Fx6i z9+@k-=n#KCcfFm0bC+aFWp0*SqY6%(EX_0Vot$MG_{f7=PFy_@wSFM#1*ucDNk$nkZo6%%y<$?zcHGJ|VPU%9KDn>bB%0BS z(IkKWO)Qe7(_is`Q&Dy4tv&aglUB0R^1WOd-or@<^Xs(y2afF$u@#Nm}6_&qm(yw2_Cr^wBS)Fq*hcOcJqI#Sk^I zPlC&~Yc-VfH07>f*9u#hJ#}5cPDt2h?oxlsp4SV3RE!H@S8>p`b6bHJxSj?c#N+RfpHN6)%dsF74-Qv!Ugg8d_f8+~cR&AtVw@U}U402c>jLXkv@K+KLMiyI2Ut zraVTP#Gzn%!H5&s7i%$r`0F4GW(M>M4hzX3qrMb%oizLl(hK5JeTL?x{S1J#R5T^& zX456~usvK@7#I5z6`wr^OV*0Pv;P86O9KQH000080F98?lXq|K1C5Z_lW1^94vmo5 aSe_g)D~tvJ0RA46y>KoAjgZ)r?r=zmK3-!0 diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-3.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-3.trdp index 29cc65c56db83fefece85b47fa65bfab7f17ee21..f06d1c1a2762a4b8314e5522cf5759f0beff2bd9 100644 GIT binary patch delta 1763 zcmV<91|0dr;sM3t0S!<~0|XQR000O8v{~h`4U=dMv{~g?p+yi?n+5;?ACs+UMFA3% z^Jp)BPdsrZ7ouG#>T0#?nRDjc&o^UFkKgoFr)C>Fq~&`Mc+bU-f-c%UvURIZb=pj&)^|HR zB!Y59Fjo?j1#!_PS8G!t)v^eP(_3UaWI>rIym9i>YF*EKE{r{fKtQmXN*q0oqi1pS zXB^#$qy0GgHIBZGqx&%PB94Y}6andf8T{^XHv0TKJkXh!ar8qReI1YPaT5Leoxqta zr*d}V(N}TwD2|@M!asmv2paPOKmKTY<2e0u>Nu>S*~ zX8egtld7UGPus+?0`+r({T*}!6x{=d5^oZ>o*q@uI(E&jZ@V`*;wG&ZCOuPiwSL;P7*j3b0 z5~~#OknAUp9`ZK&kHQE7(4fun3yg=b>@`J1+Dbphqelot?Lo&ST{cXAC=cV&Px0sh zdjHYqu@rsK+Xo%QgEWM649DaxFT~Cc8iNo5mY0dHMSxUZ1W2s14;zja94N|lL)K%p z1h?jP7|YF2+{A?<*@Gk;URkECvQm96Ra>$ypMxk5z_4AIc@Bo{LnS?jhZpdBXO59c z0sak97JJltl<$N!&$^X&W}P@r zkelR&FdEwQZk}^3vQ72T=y}ed=VoI{H2awLREg7)p`PzA5Sn~(VjoH*)aeQ_)M~9d z>Az8_$@cPsP#rwyuD6p*ZcS!XmS)L&R4$40QkT)@cu5!XxULp*{g6XWUpx$B<&b;6 zMJSr{;q`&zummiB?7F%<(1#mJeSwq=2I$&<``eh0huZOoQ^ zCOk`6eS!l@$Zwp51I|h(Vcpg=k@mUF)WX z8SJ%#8@AxK(j*QIrsq#2fql;A1e9DKvSMa|Uc*7I8D!jN!=96te@=T&U24zRy>y%f zAccw+-E4Y<9>vECbMt&(qUy8zV#!)QdE#GCO9KQH000080JK@Rb2o8 delta 1763 zcmV<91|0dt;sL|r0S!<~0|XQR000O8bdlJx4U=dMbdlItV;8-9nFas=0h6t0MFAX> z^Jp)BkL@^<3(+nVb+y{{oH=tY-?_}#qo3UF+vp48`IhUnBvmd+h&UbBw482B8V1*o zHKda#KKwx6Bm>tA&{fL}dX%r$=}YJm?vs{OR*#h>Wc1vdhJy!ZJj-lJTi%dJh>CXn zmedP^!6%C1cY36ceK{aD@vIwi$L%W~NTs@e6s@F{6-`zpsth6B2yWQ~9_iq;>ja6i zt+U9$9=Hb^I+uA;NV>h^+`q?IyH z%sfY82`tT9^Trmz0%cOfgk?ZzTb*F&ku`T4o$KQ+m7&0YUm2t`s(c08Ln5~?osoEd zB+ATu?hFhrkn8lZCRf>D%N?{NaFH4YF*Q2aCT-6J;9UpX61r&h$=0m_)oC%6%E0Mz zNOH=hoVfx_7T}^xu2!ZXRWbzfpKkrPN~p0>ElXQTR9tpGD!H zQFtc`_oMLFDEu}G?*rvU6po@WgsEqL@Vm#^==1OJKq)Vy@P{b;IvU^OQ}pk5InH=F zm9ra-zly>~QTPNF{s9al&{!1s@kiSm$LXI_$6*bf{wEsW1)FwJ6h38A*~IfGd<7cb z13$iDtV}vJdJN+3a%HA%GJghtEq6fp zD;QGSUcAs=HZb{08>H*{08fuLLf3dM-gB#N)#j($2xYoz8H%=SahF8 z{E1A1Dx)t?Tf{bf`E!E39drZ~-2;bWZ(_He9+l8Kc8s29IX8I6jY}_xYo;QqSi}nI zlx=lsw_hhtKs@Oni#RFQJk98T;Q`_GTa_#M0xro~R=!oaoEC6ZZq}MvXZD#4P3X@R zLi-r)X^Br4Ez`8g0s6!}U=6Y;^@8P)*u4$Qi?@xI^yyWBP=SPmx^%Ns}ql) z#wuxeNc0nh4|y5=N81R3ra_D27Z{IV*=yPnX({~}jUOQpwFea!SJ^0ko_QFJe~QKr z(EHzg9t*n0<)%?zXMA(=_KMN0!!o$|`Fo<7+SBFF`%hh^$CMv32&rqq!>fF~q6zA5|F@tBB zLF2xG1G2LSqw>4P2w$_)leJovwc=h@ZRGYcxuj<2YgLWE4zRahb3VL2v~3oDfQ41p6a#&@P-=$`WvQyJ4CTP}E%x%clOtSmcQT~A*s*S7#`0P2 zIc4w&_UW*=HI@z(XlaS_@Y5VtV%OQL#nzhHz5;c4G zpWjATO6~H0viX-qW$6UZmI$+aUf#}0u^G9PtjOJ;ONkHY4iwx3HTDAY!36FOuZzuvB@rO6T>w2 zV!;hta35(9n}X?j6G31ftoa0rF9=yOGoaV7Unm9<_t~ItC+T0%UQn0Vle(9TGXRoS z(WaYCpU}g0y0Ad!`w~^3-3SZTa^i`90Z>Z=1QY-O00;ndk=R&