From 39cc6be653ea40ba8a18d4dd4f8d25055eee7232 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 10 Oct 2023 09:44:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20report=2003=2004?= =?UTF-8?q?=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20text=20?= =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandReportRepository.cs | 1 + .../Reports/CommandType03Response.cs | 1 + .../Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp | Bin 3113 -> 3125 bytes .../Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp | Bin 3096 -> 3106 bytes 4 files changed, 2 insertions(+) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index b17ba9fc..5a6d0949 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -201,6 +201,7 @@ namespace BMA.EHR.Application.Repositories.Commands CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), + Probation = pf.IsProbation ? "(อยู่ระหว่างปฏิบัติหน้าที่ราชการ)" : "", OldPositionName = pf.Position == null ? "" : pf.Position.Name, OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name, diff --git a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs index 47c4e46a..14ad7ebc 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs @@ -43,5 +43,6 @@ namespace BMA.EHR.Application.Responses.Reports public string? OldSalaryDate { get; set; } = string.Empty; public string? RemarkHorizontal { get; set; } = string.Empty; public string? RemarkVertical { get; set; } = string.Empty; + public string? Probation { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp b/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp index ee213bb02a2933f1e1a6f0232d9c6a96aef15728..8e503bbad9accfeee5814cb0aa3aa49fb5191cff 100644 GIT binary patch delta 2780 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 delta 2742 zcmV;n3Q6^~7^xT+P)h>@6aWAK2mm>KNmm@;-%4x>003H%7gK*LPGn*!QX#3V?ZpC3 zQDBn=@)B$iIDKgwEEdQjK+MoH;Xd)O+`I zqHHOTZg_v9KOSn*^gTn7`;}v31}YqsubKVIiDgaSsaDO=37AMGZvhn;$|HWH zPpSsa4hyV`HL+e5d7%PJiZ~9s6I7{nD}j?OgrEv46qgFyw_}e}!Xza<1UR_s-SVj{OWhKnYjh z;OD>Mhf811^Jta}T-*FR4PoO(;2Oe9S{(4TTuTEr(nGEm-^xSp?Yt1nVT?VN(q%mUkz1)loj zW4XN^8W}toL+eZh92$}hRT)DVZUGI7g53-tE=H2-1%IH(vI?S^VfI~Jv%CV1_qZXf z$-|j87`_kjsGP$lRQ|lL++NkK#~M_B9!t!gl(# z_THPgox`bwG^Zcuzs5vDp{}At%7_vh*GdB4=tgx?tG!Ss^>-DZ$|irP$^+e05b+;? zFM&#MuuiKWt^^4WB08CEBxEBUUyNQuT~&YN43f)aT1@!zoC}GJu`e7K=ixjq1v@aK zkJe&9Zru_fAIv5X(RU$&qfA>nU6#%n9bc(YM24DuoPf`D@u&dpIbx`9lAGjOMXTUar;MZVT-7Y2X# z?o3q?;K((ukOSfj&)gltvv{MG^^QCnVRI1)=sE*512h%T^_44VvDM5C=qHr*BeH}EoE8Ar|$HK zdFC$6Y?vzi4q$!tM)7j6PTiho(-wwnIjZVZYAd3^cN+Pv zh(4}2rc+(fEOeZa#B__zN*K(!tT11_@vzY-zMFXjCX(^UKX*$aJ;06*J^^X)& zf!M2XJEv0vnC=yo{z#u`)}JE!YEL(mb2vVd`scUC*1cL<4O1&|eGFRrA(uQ15^n{A zJkpd+q2*Y^s8Tvr)_#5_4^@9|$Eg8EmAgTe^{+N^aHV-WY@AW9l(n8Ha|yBRx`B}> zokVN5OywX^qmzw9Y=DyoIBk4ug$8&aX+RBzw?&>`%rd@HB!UVrTmpHcoose&_V3z& zLN#c2LPjB8=n4r}++REPKfMd*=tBEzd}ZC{$a7`gWJ6|P{M>}fZft)*49QqO_A4Ks zD9E0g!zhZSWxMhHAsk&pRkYwXak7?Oq#x7KN$+!^&Ud@S24TA!vcv_)S{GR3<_shE z!!^!yf$9Qm_d_<2x3V(!=S3&uF~tSRs&` zr1J;Z5<>$9=^ulprRWNA|Jb>@$n0f=rvFfL-h;|{8tWy@c^nn-Z8Hy!Yw+IIiK5C> zadeUBvoP(_^;tq{bbOpLD%G^2dpJBnEe4TPu}L{Sort4}PNskNsE68&eLYU-;M8f~ zLNk)cx5V(AD`CF%5l&ZEs2KFJisd z{QDp)+`KD&>n?fvlRWWBnHMB7Aep+$0y?&ZkP*<&9s4)zpXwLxZ4SGQy2MM0pRs!@ z8zP5jNlel(+X-w&Lq@}bG;FMyhLqI|PF{e9K366-@1$FdEd5M?obVF-{p*l=4VMQ4xuG#3^xqjP3nk7z5s2{EYBN-!E5t0cB$Ddb5vV%mNq{&)60uD9*OlO4wGe-I0d;yhlli`@9*Cl7{{Ycy2``|7(|YIFaQD5<6JR z42*wqoKr0+C3A^#Lp3j#2nQ1xxkSIUOp+&yLup1HMxOZDY@syr_!lK(xx5@fNb~}9 zueu%nw|hSn{d@MVu0wo!5ux3$rqBxe7a$S_Eee-|bgM~F2fT5EI$hlIhuugmc$fnwv6wJdpGq%*c7AKB=OiA0u}bBZbU{B zxkC0MIP?O041yK)^QJ_yo|bygny4PUiPDMUy!r&q^WNtj;HlpM)ISpdM?c6&gnMf+ z**DD@Fb<8eq$%f;|L-evCD+3mH(dLnWx$@h-}}R-TiYAQ8=rEYeRdz!0*B5k9?s_z zG$=g1PFwn90-<-H--v2_0wm)`RAlEAjAjT<1QY-O00;m% weMyte3gHboeMwgw;NMDY3IG6Fle-Hq137(3lkE!|0ko3|3?>Ga3jhEB0HhEmU;qFB diff --git a/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp b/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp index 44fa71567488c46b2aff4dc24469a844fe5bf09a..f394dc3dc8a84a25f7c4de5be51511523ca1df0c 100644 GIT binary patch delta 2786 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 delta 2762 zcmV;*3N`hj7?>CrP)h>@6aWAK2mm#GNmoas2l-nH000V+7c+lbZ`(!|fZq%3f8eS> zvHMU;q$Em8q!hMe$3YXvu-p`jq7RHXk%>^GN>YuTAi#F9KrX<(ED|i-ec84M0<JQcp|pf&XH$;Bc24!jjyZ>HB}fPa%QoBN!=2Q@h4(8XBZ$d~AP#uq@LyjT{vQ|Buj5)q@vr;*$5cYT2b&^AAtb)hlV}PNYRZA} za2J2bu)x;7sp|F}eH&VplYMy%0!siJXExE#Nwi}E@CeL>#p7clf=fPW_cTbJOn|m& zC?{mQZUIfRh{&M+=o+fZObcM1Uju)Q(7`6HfVdDO9>nEzZ6lG5HGDbs8XB6a zn~+pT74$cNx70_T4o z?3<%z^dgx7XK-i0Ei4&sk#Dp+rQzP0X&M5K9ODWF5NAAdmxyO^t&R1zG80^MA?ffl89VW1yV#*fGY`q78S*RR5#jjNFqcSZ>(Wt;KNc&GB-T5AIy;r;Mr zn&_8w7}gAHD%RblW8Lc%$2u_5d*FZJIc6NDNSbl6!FXr9)5n#|?}#tp8H6hwJ8wlJ>gT=&*`^cmrr zGWu*XCnCc-#au7jizx8jR&g(4!1cy-YN)!6mNSw}ORQJIFz51OzI^9lt5tt~HuC^X zWb;9=?v^CI$h7^MU`=13n-I*XE=09((d$nde5WC)dI&Z8>p`uO6PL}(XX0q z`!S#|!a@{hSg4>r-``uM76+Xopw|zV{f#q%Q7>taW zZvQE!`MZXxK7uuswLgC}wy%FSvPzg)h>K%!<;z8iuqZMXFB6L^U+PhW#mXnR8H?N+ zv$*;JRsk4Wm3J)}jNCfIxbk680T|nrJ70^z$ha!aRhErwl;Ub%)`1pMC6PM++3jDD{kbJP104ia=)HM{X1deuwkgq!1e32oydL9 zf>AaodlwP|fn;@vl;MBy_1u(2WcmtFq0C@*^+FQ*3)SA2>iGTgJR)0EHXxi-4*T$B zOJNhnCf(1JyGPT7FVf__6E}gnN$%u_H8FKyl7}78tQ6fK-aK^APIDg_L9>6TIyazk zo+ere>pZ>`JDOx3owVTnts_-asN(1%(Q9GaquaBT)Mza*<*9$vvu@qT@hN68yhs(B zmeaS1_%hMR^cMB0&DqxDlm^c1_?_!$5qU|B_PbL0T(9v7EidtTDc^?YrI1~&ZjSNB zf~TZ}V$yp9nJ1)#`4bZ{{vbJ+)bNAFXBd|_6I1y-OnUbxz2lS7FG$sZbk$uH=!6$L zC(tik=Qn)V(9eI|#~eNb=q(;r{D{vgav<>}+<6Am?%Xv#8oo5z@A8ZtF3 zsfMi;t08}7G=r0uP(yOVQ7$dS+7|er$nG4|ub6nIUt#7lsHdDNyDHStE9EsFveO-{ zEk=7xJfl6#T!!`(oK{KuQ#?oy2kgJ$L*`Ej>?MYMOgzIr%$$yWR%fWV`-_5LG51%8 z?{%eBxxa$fNA&9qgib9qWyjoLNzw0}8!Y9><}!b8hs3!_%kzSX`F5zVH^-%Zb1X9a z?yh$DEmqh|Tb&n7%y&=%Q$wbPCDl+|u{T<*&>LO78!YuBB22@WhLzPYam9}2?#25f zvb=9%O8IaJn36FiE2CsW%97`$DOt*!V(pxMBJ=vi#WQUS6O`9BX(`%Pt*?Pe|smngeZi|P`w5kIFc z(RVA8%9H0r;P*gzvQIH%x>Hzp(4k-z=}xdWGLg&A5yr&#JooFdZRdQavxO7lmON9sytn zS#Zq3EZVLlQLx$y-W=|4&ySEP#>pgU><@tk+tV=PpNBu0g5Uy&0@6aWAK2mm#GNmq#c^m&uN3fv7feMwhGqX+q03IG5Klc)