From f43ca7014278eb3f80a38422d5e0dfb365dce71c Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 5 Oct 2023 13:42:01 +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=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=AD=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=9A=E0=B8=B4=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/InsigniaReportRepository.cs | 16 ++++++++-------- .../44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp | Bin 2677 -> 2444 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index 36e37419..decdd8e4 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -747,10 +747,10 @@ namespace BMA.EHR.Application.Repositories.Reports { RowNo = 1, DepartmentName = _organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false), - G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0), - G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0), - G2Male = g.Sum(x => x.Gendor == "ชาย" ? 1 : 0), - G2Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0), + G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(), + G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(), + G2Male = g.Sum(x => x.Gendor == "ชาย" ? 1 : 0).ToString().ToThaiNumber(), + G2Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0).ToString().ToThaiNumber(), Remark = "", }).ToList(); @@ -793,10 +793,10 @@ namespace BMA.EHR.Application.Repositories.Reports return new { - G1Male = insignia.Sum(x => x.G1Male), - G1Female = insignia.Sum(x => x.G1Female), - G2Male = insignia.Sum(x => x.G2Male), - G2Female = insignia.Sum(x => x.G2Female), + G1Male = insignia.Sum(x => x.G1Male).ToString().ToThaiNumber(), + G1Female = insignia.Sum(x => x.G1Female).ToString().ToThaiNumber(), + G2Male = insignia.Sum(x => x.G2Male).ToString().ToThaiNumber(), + G2Female = insignia.Sum(x => x.G2Female).ToString().ToThaiNumber(), Remark = "", }; } diff --git a/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp b/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp index dd9302cdbbce912d825364c72c7430689f06e1d2..57a8f7801358f3749f64ca51659e7e412855d74c 100644 GIT binary patch delta 2103 zcmV-72*~&K6pRxXP)h>@6aWAK2mrBbMOT3?tmw}N001gckr*<6TaVL56n?MN|6sWi z>Z+<8JD1ItENFMp0^*|8W})h%NruE)$4(umEPY~WC0bgZ3avmDDy%3iE2MI3z5mAQ zFX_zjOyZ2ki4ziDE*dSg zEEfv6zUf@6+D7}dYt~sU9?-^3o1WMHOjSFzCTbZS#X}Zy&26RTv{VO&!?dcX=3&;QGstW-Jv;-Q@D*}@P>;5tG@xtMyKbRg78k5L zwnsZ{osp`BYh3Bt(nWL)Pr>{emujW9Crhi2)tiReC#Me58(g+_MS6V6) zJ{i|JrL+hFJ&&%EEJNo ztH8e>_)p<~?`_iZ;Co2l3;eyne;FLy2>fp${ZDX!+dqenP(|9~>}w#n2Z_f}{u^X} z3J!jh0{@4={~LPZZa1OBL#X~MLgg1o+z$@E3H*J+0pW5NdffzuUPc=4hFMu!u^Sei zVUB6e3k9a-RB2>oDfqwvExd*Z$g~vYHIdvTWSvf9BeH{2t zpy%zLRu}%g@%zO8Bb1dX{afhM1T4M+NbCbhLM-ir9G0%cs>%?lHgyTrYx-)cD3o6_V(an zNCB;<#Itl6;RUc}ShV}#ku{33Au_#)x^w2WUX%iwEH|bTUex0Am z8nUboSIC$kb<(DD?W|o#JFrNsIaar2)4VQ!lget_Aoh#Zv22VaCK{SDvPcVR;~#il zDdd*8#X4UYwOB8&o5-qnl+)S;!-~P6Bw}m|h~Tj?1O@|*R~@>sk(HO4YHd%zJfdV4j;X%<)-bF+VZP zF>4ncek~s#Fwgi$ca=@N6HFpPZ&|sOF?577_gtQVP!-CbpqQZ{!t|rsNCSXy@(|@LJss zeS*9rRBXehw5^+=Wt*X0o4Qp?wrR;0ZHPTf1nhA52~<5E{`gCwlG+brO3JXCMEd=}Zetp&W=Sb)++F6PRvHOg0=s>{ zWeCJO5DD{w!8vr}@4>SA8lxLP{3MQ1d<+8lg@uO`uv3P>q`QR#cgU!NW4fcGE(|${ z1xfj!bNu&D-j1eGG%z!*3zJ!&8;6|3hM&YnD1Yc05UNY4el2OM^3L>s|BOYvz2QA| zxlH+y+R2qaZ0|q5<#_82&xEFfKm>1c9(~LOPcCqVYUjl^2pn4D*@hTUQl5tQ*R`n-{cX3nA|OS16lF9)}Xjs~~h#Yf8RYjP9q7ec5%q;}b_XO1Mr5{67>aB=pG! zo_Pyl33Ze&kl~(xwL4g9rm=xs)2S;kYV;waBsJt`tA_EVUQq|0g;NLKg@e*)iwb$E zu8KVJyj(}xFxtpHXWDrD6?}L+Z`k!t4VN(ttYM~2yX$m2(2{Y<#=2m*4KreNS-~Z$ zUD&2j3!z6e9fm6OOiI-HR@5lbiW+4%ECPvCn+SQV3zTeWcB4@6aWAK2mrBbMUxE);SRBDMOT3?tmw}N h001gcll%!T1F>sGlPwAx0v8CAN(v@6aWAK2mn%4HCH~3P{_Cl006L5kr*<6ZEw?76#hPG|G~;6 zv}&3YJFgunh!zzP162($?W1Wfsa40$9A}h$q711U8=pppU<|FTST`!9@jB<vdL&J2Y|CRmW+4kX1xc!&b5OGlk2rA}IhtFK;xQo!$3h2 zXDnK#LmOQ>E7dexyV^0Oi|9HYg#I1QRZ1-3a=e~iKxY;de@ED5!2~oKZ4-dTV_nx~?I3QeZK&xB8(2G#z z4L_NYPMHk@k1)ry=lDWXa+#1Qnerqe(o=@sz_49^K&FH2{#tQ5U8@KSWs`)89;wCLr%60AL>=;Ui}s#=OTeeMkfq_5gXC zK8hrNJm5z}AXF3q!gm7f0Al@oOm!m*D97O3njy*xGs6gx3QwWIv!O7S1b;o699q?c zV3n>QyvD6)2F<>p*Xss)w;0y0V%B;~dTF*2hOi>fmWw?I=K}ny{^C!EO^7Jmpy#dn z4SpmG$S~SmCS!t>Nz2ytb7mc_!wRrq8J(toNz-bE6xLcA*`in(OGZdyqW*40R$)PD zboS=uLXKaJ^99k+!z=OJqK=GuTRx*)&XYh+i7A*5x1Ensk<8`lw*K zFx>|cRdC!c3K@gW({o6QauLdlQ;u?f;c+{kUMo|a_sWvsyfoD~U&bi6*Lakt=j|hh z=4w{-g0SktRq)=>FNj?FqNCwzvIF(diUF<dG=SHV+lxC!HH5+-` zi#fDSWb<#OMR=OPl$*dr8{6~}O)4V!Gq%-fMHB^d1&aFYnZ4}jx>sFT)s4D;kerxg zgFLH3oMi{mszSbQHiX@mUMA|Voqve5z(2DP{0>wnavLX0hB*sU?y zy-^kV8${fnT+liG{hQxJlPDUP8Q0sANnaWVT*3xl!-gn--~!;QOQ?Q-CGMQ^&h-D3 z`Ley{&2+g``JvL$l|SgRQaLOY1tbD)~ti=4H2LuybABL%fb%3Utrw0{Iyn1w}!;m zM)tNjf(+UsoHNAnm^UDQ$+?^o=&^t|f6n`ucex(3_wkfDto8dnq?WQHXDLev+bOgA z_QAH2Xg5B*7@kf2Tj321;b2pWBIin>Xj80| za~yR^L>}rB`WWnI`!viG1eA)6-=roDiNi}KVeFgB_<&^_x{0EJxqSJI63~grq+H;H zRtTA(%W|pMlbIra=ZnSgx$4+A9m_dB(0Orpfd8U|%Vf{}OZMq}wuA@YL|8~|`D>)v z=gc-1oUSb)Tes>mbQ+FG6sL*&WHm7s!81#LNbaIjY*8-uVKkXVw=hfqqA%UwD-hK@ z1|s*dK}aBhxI{wfgh<8MX*j;aEjJqyghJK3% zM-v5DyA55x0L%!2twHi7{6fPn)F-8Zz_wvQ+y(~r=)9#Y1%dH4`Cxs*hm3w`xO z!Q;00j&M7F@KZn#F3#EYyUhXi?SOG{b{+2?f=b9AbJfvuVK_6p8p z(`W$?LpM8Crwuh3m#nV~n%&SthiH~@nNAUyJoLn;hE{BU-ULU)@M*f54HKX;4jay>s1BeuClAbWZ^EbwzKVVhy=`3diUs#`_Wp^Thv9 zO9KQH0000808&&nlOzb?4pLM#S3ZqU$hZgq0I*b(6A3OLQdBipi2U?h($wg3PC e6951J000000000000009lVJ%Z2I2_-0002f#ESp`