From 2c29e71ca250729d45d7bb476cbd89964803b893 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 24 Jun 2024 17:43:03 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20retire=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/RetireReportRepository.cs | 7 ++++--- .../Reports/31-ประกาศเกษียณข้าราชการ-1.trdp | Bin 29060 -> 28967 bytes .../Reports/31-ประกาศเกษียณข้าราชการ-2.trdp | Bin 29072 -> 29085 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index d7d26408..382627eb 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -120,7 +120,8 @@ namespace BMA.EHR.Application.Repositories.Reports { profiles = profiles.OrderBy(x => x.order).ToList(); } - return new { retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles }; + string SignDate = DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); + return new { SignDate, retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles }; } } else @@ -193,8 +194,8 @@ namespace BMA.EHR.Application.Repositories.Reports // }; // retires.Add(data); // } - - return new { retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; + string SignDate = DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); + return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; } } #endregion diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp index 218d54f811be3cffefb5b400f990f9fd4fcbac20..6cda9c7f021af85fed3fd510f27be077a928227c 100644 GIT binary patch delta 1779 zcmV(lf^%+p#B`-6dPZ3Wb?7XU^q2XU@!cT4y$f7Wsm?p6S?aMORA- zVRqN)nRdUejQyJ@n#!5eAAZnUV}B#Z^~rU!=MR9dp;l}4?oc6D=#aIQihiP^5M$un zHf%aN=bF8?vhI$VLO{IjwUvSIk3P{fuRCBv>Zv}nm}}lryUtK^Q8MV$%B6BeE33K! z3JGZ${vC^96FRGo?Z?X2&l7{X^v2lk7#BgSc^8O!edH@di)L!+)Yb)`4Szi$Wrg|F zv<%ku!Ci8mnf-webE|5#(M-MRWw~N&aC+9F16zd?v}qAj)*+!|cKxx-mYfZ8VMzNR zL&N_)ZIq1Y>NRSOncBH>P7x8QaPx&j*tx`RLbI;ccxT-iwUrWYfngY1qf0H;aUBHT zv8kny%jS@+-x+~UldIH5c7I<$l2NW?%#~m=2N!L6wpM^tOA*MD*V%^8K@ka9&-z6_ClAFC{C=C^jHZK}&2aKn82lUtPjKQN$gqPN^8!EqXn$kn6#Se$g>zu| z-*B>pHf@q{@(rKO6)spU=ivfjbPMVCC6c+cCxRZ~1dUzP70LVswcJPH|6mtjevOT1 zf-=GOqj2(l>g%yo09OJ6e#3dY7?M=a@d$#QSV3%Yq+?U)i^BR8Cp{uyvI^l<$(O4p zvwEKTIiv19g)CFs7=O5?eM{7)C_()wv#PSZCOqxVT4o<=<1({-<|>O!^*E`sG-E(V zOk{aYt!C4_q?Xexuc?(J&!JtZruEC?GRjhat}$5cu<~P{E}Olc#TMw3@PL<*ywppk z%_8?!OgAd7ZROMJ5}^_aG4%i?p>eV*s|hu=SuJPk0?GY_!GBMfWzRAH7QX1d3xhYf zyf=~f`t8?LI04RIaRqGQ?>5@}5>?D!;|ExXAQ`;i0?}p8zKy;-NAGqJgx5fUHTz@4 z9-wKjP{-35E0dt4$KhlXWo*YLPhiSpB20LJDt58^H}btgr?v&W56}#3W5EzAqAeek zaPBu~`cais@_$ZhDmh35w*-2C)lL$Ib;qX&QDoFEE&}dS6cGsN!+GViHm`j0b$Hap zGglD`<+GkGpVg!!=oPhE&(?%v`JyoM@Ay1iq-A*jFvyRQhlhl_8Xa||sOW0FQBQG+ zH=LO#C=zYAh2<~u%7DnPP@m1+d@Ju7C3?e3c3r)u>VLJV%+b|yQppa-qi*lR^ICD9ZGLh#5Q>9k5 zAgU5efm)12QD$LsODoh>u+X)co8JKz{DC5}`G1`2j7J3*F?={Q^(84K7ZbR(JTR@E zRGeI7ALYmbr0pfDg>=*IOSOnWsn}UF<8;O09B6Wc;uP8^cK%+d?YZdpQ)o+#nM;0Z z9XI3^Rhm`FAZFK9sAsMPcV1B+W>wl*qGs3Ny{pKfGOBXWl$sg+nJTJp8%J5`o{FPs zi+?!sR(`|m7LFBga^%=Y#6t&q$+42p-S17%)77OPedKFz8+qBGbdShSN4c_?Fu#YP zEiWvzVplKBif3eAIHn$4w5b=D_;n`bXmx0x8O-O;KOX7O5pyq^Hms(zRR}G$dtR6F z_lQ+$d5j+hZQvX`V-HycT`0Ru-M*PQcz+1O)i_J=gXvoQeK5V{s%3m4S#o^e8A3mM z0%>Vkp)D@6aWAK2moh`lf-ZD0%wbpwQxudXN%ZaWT)I*eFgvks~nRHaV`R9 Vi<3KX906OCSaBu>N^k%G002VUVP^mU delta 1884 zcmV-i2c!6>;sJ!?0Sr(}0|XQR000O8ONOxwlxPl1hS*ry85*M61^@t~B9pFYFn{G* z>yOh$5dU7O|AXa96@0*sW5)@_0dY_s;?d}GfcnuSOJd>Jk?oX&3aPY6cl7b0qNnPL zgv6l=+6t+qg*yL@|CG*-y|!a-lFMC=hk8O`Jv%#(-^|YJ#xYK;4{YHJ;`x^AG(|q?5IMNVL9RKhGV}F$lT`v%>S>2!ye052y>79WnTs8-!DXPj5RTSEN z_g336hi5&j+Z5Nl5fKFt@Ayrz9|XfsWZCcZ$-wlbfY`*dZb}_@AbTho^vTsqRh6rf zB7#CeFxtUwo8S;0&bUsHC|f%xv`x>vK5|;^3!v4y14Kn12BILxE9GpdaeqD_1D{Db zO#;)h+oThKyTUnQ_4)y<)g-On$h_(1xe{w|dETOht-=NJq=*UYkkGO^!N?;k?z(V( zVD>_@p6!}5skl!!k?q?F)sWA8MaYlQGejaAFZE01|KJn z;To9!HyUrEO&dZq{)Vom3YV;w@=$>=yNUFB9LZGLV@8j0g24{zie>(STJE9nfAA4t zeuaalj55aY!)W|{=IfzM09674e#3P;7?MoS;TVGLL_uP4tYd@ei^KW^7d;ffWC_A6 z316PEh~4$2&xz^X6@P_Orqk|wmUENUrZ_=^II}cfUJEqsPTE!vYU3&51jG}Und(VW z=V|S}IV3F0Ym$~v^NLi>vb-j#X`aJa)w25KQyEpRKUWFtcG&rePnWE2*CtE!iFrWF zNKxuV%OSCQr!6lou1)dNYaF2*2?=$9l2AXY@oGX%YG~D5U4IY?e^K}oX4x~$zol=w z@1pQEZto2wzS{quipIeCEAD_z{M|5x|GxTm7L3jle z*t0*z>>--=5_LS8vNHvg^e7r{pp31=-Z4C6xO$nty&!B~^GUHC0$7f}0FIz-l`U!4SOYvo^1M z(tUW)#j{WmO660}mrpG%35qIddcGzcDi(#Qe~0Jc!Y#wQhk<{L+&d)d3`i77uj?5o zilkL$AE1P|+ZK1fBuVp7QQtNy=5;&mvP#+#vgV;Hyno)&kaRV7>j|io;(2(*?cOeW za*EitUm!9o=$x?X-a7Ae$vP+l=v;d=aFXY$NGIDvlitqQ9D6K@1flUojovFbv*m=) z;OL+fQlidnoRwTIu);BPeT(+-yM_2Fm11C6FlLwskz#=C4lCsyz)IH_!0NJF0!n!k zKvmxbpnufe0_A!=)3NTDG_gL*jZ4^7-voBW4Oz)yryc-yaBywZ3zyr<0@!tlR|KlT zvkP@kyX0_j<=4_TgSv9SsMn-wt+8j+Z;Wi4B0l$$dGu{$ta`xMDUzz!EN41)bS}n@ zjtba$#Pm6PTZ1l7lQX6+6*fcW^Z zCcY5P$mLyQoa$S4mn)7hvWIf`Y0YPzc2eMTb9*Bs$qX|Mq+3pp>j9hOik-GH*@QS< z2!9A4{UqIY8JA#IL}pg8xm_2MxKf{5|0ilyo!?%$8JkXG=3apU?b((?ShJYccBhG& z-jHY4#yw@Lx@byGjs8>>+J56$>f^;Y&g?~Qr__fg+t6MEz2e&G8?pB$=-KY#mY(HC zzP8`U^X?ooB0m{rbva>v4@0|fpIAJ!`hR{yTRLDa5L*3z7Fk5RzO;-Mpu)&N%jRNvnlin+O7ZNya9G_|-j4GYa&I z=@-(J$9*ms*hyj*v=`JR_N4A5&lv#8mTtird_V${EiBO4aUIlWzt`ZbWyItE0Z>Z= z1QY-O00;m}hS*q!G{v2w0002*0F!fX;{r>DlUQ&_4oimESlJmGqS^)k0HY$4u5c~_ WONNu)a2x@+llyQc2B&ZU0002RiJn9N diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp index 06b302182d3e0b0b991347a9cd4b424f771a0ced..68cdc93297a96bfcc05ebd31bdcb0815d663a43c 100644 GIT binary patch delta 1915 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