From 1dfae43619817173fe1a4914994c57392726d33c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 8 Sep 2023 17:39:17 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=20=E0=B8=82=E0=B8=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/InsigniaReportRepository.cs | 42 ++++++++++++++++-- .../BMA.EHR.Report.Service.csproj | 3 ++ .../Controllers/InsigniaReportController.cs | 2 + ...š āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ.trdp | Bin 2410 -> 2069 bytes ...āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ_Back.trdp | Bin 0 -> 2485 bytes 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 BMA.EHR.Report.Service/Reports/41-āđāļšāļš āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ_Back.trdp diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index 1f985c73..38567a88 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -9,7 +9,9 @@ using BMA.EHR.Domain.Models.Organizations; using BMA.EHR.Domain.Models.Retirement; using BMA.EHR.Domain.Shared; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Metadata; using Microsoft.EntityFrameworkCore; +using System.Net; namespace BMA.EHR.Application.Repositories.Reports { @@ -427,6 +429,38 @@ namespace BMA.EHR.Application.Repositories.Reports var insigniaList = data.Select(x => new { InsigniaId = x.InsigniaId, InsigniaInitial = x.InsigniaInitial, InsigniaName = x.InsigniaName }) .Distinct().ToList(); + var tmpOC = data.First().OCName; + + var sumData = (from x in data + group x by x.InsigniaName into grp + select new + { + InsigniaName = grp.Key, + SumMale = grp.Sum(x => x.Male), + SumFemale = grp.Sum(x => x.Female) + }).ToList(); + + var ret = new List(); + + foreach (var item in data) + { + var p = new + { + InsigniaInitial = item.InsigniaInitial, + InsigniaName = item.InsigniaName, + ProfileId = item.ProfileId, + FullName = item.FullName, + Gender = item.Gender, + Male = item.Male, + Female = item.Female, + InsigniaId = item.InsigniaId, + OCName = item.OCName, + SumMale = sumData.FirstOrDefault(x => x.InsigniaName == item.InsigniaName) == null ? 0 : sumData.FirstOrDefault(x => x.InsigniaName == item.InsigniaName)!.SumMale, + SumFemale = sumData.FirstOrDefault(x => x.InsigniaName == item.InsigniaName) == null ? 0 : sumData.FirstOrDefault(x => x.InsigniaName == item.InsigniaName)!.SumFemale, + }; + ret.Add(p); + } + foreach (var ins in insigniaList) { var count = data.Where(x => x.InsigniaId == ins.InsigniaId).Count(); @@ -443,12 +477,14 @@ namespace BMA.EHR.Application.Repositories.Reports Male = 0, Female = 0, InsigniaId = ins.InsigniaId, - OCName = "" + OCName = tmpOC, + SumMale = sumData.FirstOrDefault(x => x.InsigniaName == ins.InsigniaName) == null ? 0 : sumData.FirstOrDefault(x => x.InsigniaName == ins.InsigniaName)!.SumMale, + SumFemale = sumData.FirstOrDefault(x => x.InsigniaName == ins.InsigniaName) == null ? 0 : sumData.FirstOrDefault(x => x.InsigniaName == ins.InsigniaName)!.SumFemale, }; - data.Add(p); + ret.Add(p); } } - return data; + return ret; } //42-āđāļšāļš āļ‚āļĢ4 āļšāļąāļāļŠāļĩāđāļŠāļ”āļ‡āļ„āļļāļ“āļŠāļĄāļšāļąāļ•āļīāļ‚āļ­āļ‡āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļ‹āļķāđˆāļ‡āđ€āļŠāļ™āļ­āļ‚āļ­āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ diff --git a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj index ca5e6738..44241a8e 100644 --- a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj +++ b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj @@ -303,6 +303,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs b/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs index 5daba098..e1146242 100644 --- a/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs @@ -273,6 +273,8 @@ namespace BMA.EHR.Report.Service.Controllers //var tbl2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; //tbl2.DataSource = _Khr3RightList; + report.DataSource = data; + System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); InstanceReportSource instanceReportSource = new InstanceReportSource() { diff --git a/BMA.EHR.Report.Service/Reports/41-āđāļšāļš āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ.trdp b/BMA.EHR.Report.Service/Reports/41-āđāļšāļš āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ.trdp index 6e39becfb439bcef1227a24b258fcd41daa15334..c7c854a854c14af7e24560f96e10b30fd68f8bef 100644 GIT binary patch delta 1738 zcmV;*1~vKW5|t1aP)h>@6aWAK2mqRlC|5_Ua`;#V003W+7cqa`S^aO*Mi~Bm(*6g_ zlTahHbL=EeG8$0Y5?V2!Y68>tn;TyftBxJ)Gn7q810j{6P1A%Jf=y_EChbE=8ylPR z-}q12efZ+@#c5%stgNEN_ukig&->hSug{C8c1Esp1qPwxdo5K5WmSP*-?tra&{89` z^?pM=b@JVJ7B_$3*bk8Mkz=D_OKtQ=s?yzd#!If{ZLeDc7`D`25J6QrZ;fC}t?H`s ziSLhEs(~90{i|Ki8lMRqn>WMLdbrOJq45Wr7WRj5WQ71h7Y5EY==&orpfh4WG^1=( zG#%(Fc0^GY*AN_q^br?UAhH~{3;PH!Kp~zi1<=}Vspo%v4^OiSoxu>b)H0}>2639X zXN$ekap`bfbj^j+A~tk<52c-Yt4h}jtj)+<@1Di0az4dI-5euT(XtV={17>Bsi6mV z(2~Eyq11sfhT=YW3D(x7uw+50gGQw$MkRm8*fc0>UWh? z5gFC7~#Py56|68}hB-AUrV zlgVvdUjqOBM;Q13qm;5?h}ZES$>ekLFa9-&A5bTE4=}o%F&Kp;x#Wb-rVDxQCU9mM zdiVf2Vx-wqR&*VhOr(o-;7o92K2PE&LPG;7s8L?wUZNO&}kzMjYl(@bt8 zCQYl*vWt=?GoLc$n!QTORKclibFWxbbV1<7KpeXq`RGJ4xk0t;p_0TmF++ipOzvu| z?)W;!aRl+gLeRVFe+;dFjQ8Tu7H6kkyEFi=m#Gm_Ae9H!5C?H!6UD}GN7TvB_JwtPg5zX>hxr^u6V+@kjB zu)9JtT>O)Y^HcipgxY_g#k%(C)|Fy^g7EZ&M3!?$V1ks#@ae<4%UCQr!lvs~Br=MYw z{RZG)MWFJ1(vol#BmOm|BikhR=rha9*nXI{yiLUgXP6$8lC) zV*kyLPI0bw#G+FJ4O4z4o`1b%;4RT8$U!bF7u??*_WIw1F25o^SQM%i5g$c7`1Qh5 zzVe^J^jh<_T;9blf`wKzgX=;>?u$bV$`}S`9nWs5?J7pn^6apWZBv()eK#6;%YNh` zdPBX8*XnqYABD6lZ^s=tX9a%)$IFsCZn(&`nuKH{eM1%BN2w4k`3RAlaH`?jbW!4< zY>C`|W}+~4hY%v(g<3Wu@pgFz%XP~pclTWVNPxIw`&?9ap^L%wgM1EqZ47yZLJF7+ zI9LSuB})!&QR`JSa?|iivrE&Z{!EvbmNNhr&jfxno;IhYl%E6gETn(pw2l!*bWbo( zKNtj#hc0-hufX6M2?5{R!iR(Z&LigGSqR5He*n=ic2F^k9{YSn96yYu9@THx^Fm(|o*x)4Dar7aJgxGXZ zlNOQ2qaX&{c=8`mO9KQH000080Gf;_SBU)dd6fVF0JZ=C027lC2-6Lkj3`$}taA8R g1^@tGlkf;H0-B7IAqgA;pazpa2_*)C2LJ#70E7iV5dZ)H delta 2067 zcmV+u2<-Qj5b6>aP)h>@6aWAK2mnxhC|4%qaS5#l006R)7cqa;SzAvVM-+aq)c-JY zr6?%Mtakx}3nYT1X`-|h!lYFnw|D}p*t@R1Zb+YEf@(+;wFw3nl12rDXh5`qkaqoV z_NQd#%*^iW#gH^ktMXuWXXkRxcfRw@ZS>-NxrDwW)tcqlV;LQ1GlTlrYiYBO`BY}T+#N~CJt!ZS`;tHNm12F=JC z{hE&T3^f9w(Q7U#*Wi)9Tqdq*l?r6WrN*PH#G0LR$1;D0!R+D|6xAA{4`^C&@03XJ zN(-(ywksMb7W{wCGL-YL^ixB=KJ~p0d|iN=&!F&yQnL*Y>wf31?=3=k&}~zxMqiJ8Zx2e2 z!2nwR8@#Ugod*(fm%FWJGYS|Ial}9wFIlscYnO=al4`WpiGk3f9cqafY69{TqR@}C z19~(HIb$e{Lk-;THP}~+k^ulig z4-Uoo(Z%y*mU@yN&lvy+l4TXjUZo*2^uItv$3w%zT@lGDi0C>Ou>ca94KG1AegVbU z;KF|uhhezKFibe5;(Jbx0X)cOKZ!|R#Y9)MoMMt!G3h*_yy)Cxl0hYziO2$o`j!;n z9VltDLZ-p1e&->Btbk~7y2T*MXW{f5j9)Uvbfp~ece=hAO zOd4&d+)!qla71*Lx`CiRt<&m5XFi(0JVJke#z*|lW5)YuV9_Rf=sWJ^!ZCLPO+&^jrU42-VvzMBbuNHI6&7poh6uVqbThIs6~Qrbiuhx7R12e zeo{LGMC(#3T2eK+gB-D473BtlQYf&>og|r02U6h3m~;{nidQ`OmlV5qCDwm!X>J32 zSVv*+VsY9?iU(hyc;H-Hu`6U?3X#IdE(Vc(6ZJ_Oi473Q_ag9VIWl~ROltFO>ECWB zYGISM?7SH$t11<%IHs)&Aa*?OgQ<2`W)$Bcahc*=+!vD#-+qN{Q}jb^sN$6zayePM zi+V7eIOIoiDh$BxVt&NrG&6t0b%$b^YK;ou8Uv88URq$yp3;B|fofBra7$|mY=9IQ$BS_slmwWrOrKf0ibPdZ!Dm~@SglO4hSmM6u%Sdfr1y~I-z#g-Pa z1q1BBStkd8>Rsr7lUki+f>>-z4Sxy*Xvy99hQbZrdsCS&g#&K|`)YrfGT};VKe8YY z#{DWYZY#nnu`A~IZ$za@r4&u}C&BEavLx_zTdMM+&_PE0HFlKYH6*#S8TzSjUQyNEx;qp&nALH?_dg`82==X zp$?(#ahLga2`2J2HeFF=OVIffyLj1j36H=z{=JX?>mHBZYr@;dV^oXWo@kNl6Mns- z)EH$KItAjgTbO?unlvkL}o+HxapUYQ5AcLADyzQtXt47hVHUO9KQH00008 x08o9CtOnu@P<<#@CgX7ltp@-AvXh$!F9J|~lgtMk0`&)z>IWqT*9ZUr005;I-|_$e diff --git a/BMA.EHR.Report.Service/Reports/41-āđāļšāļš āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ_Back.trdp b/BMA.EHR.Report.Service/Reports/41-āđāļšāļš āļ‚āļĢ3 āļšāļąāļāļŠāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āđ‰āļēāļĢāļēāļŠāļāļēāļĢāļœāļđāđ‰āļ‚āļ­āļžāļĢāļ°āļĢāļēāļŠāļ—āļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĢāļēāļŠāļŊ_Back.trdp new file mode 100644 index 0000000000000000000000000000000000000000..578d95e2b14ba7a7a36fe814206a5244a9fab2d9 GIT binary patch literal 2485 zcmai$XH*ji7KK9~5Rp)Zl2BBFbO=S1;!;Iw2BZp7qzsXS-iHt=0ck2o@1URtgkWe= z#NZ%p0^@`#HIx7nC5kiwLmBU_YG@Kf&11NZp4R-nIbcKq2XgQIAm{O2!%F?p z-rD7c3sX_af0oL)LqDyXAW3m98px{ijX~MA_cHB|w2O&URWV_5=9$L<d+`LGaIX>3YiO~^Y#sX?+!q~B z^hk%T=Ar9o2&Gj*A05OkyjyY{*i)i#Q&ynJAge#(`A2D+3q|l})|JtmknsK-4UFmm zV@YBc8C~q%_E6M`V#UTz43CP`Wqa%Kag|g3V@DvfqfMP9XrvQBk5GXZ3#!BYqN)N^ zvU*1;6Z!+3F@1`nFPbpfa)mo#w5*^#IRc9bsq ztRrsmWlPmTr20TTVfSZngg$4x?4~DGsH*(Ib(vY&`DBwIn12TmlkQx%l-cwS;y~~! zn-IDp5~5NEy7Tk$ed>S^yxNXH#ywHNX<@d&M`)2ki^!PInk!poi{~(yG1C&4H=~^u zv%4`?Itvw@oJ?90-oJvCs9&`j2c|{gzar4gm>{mRmyE=w4v8WKUO6fbW>E75p|(KA zoX~?-)IG+X+Lv-H*ff=Ffor&8|)Zc{Qq|upt+L*9q$(ja&J4e8OGDiU}Po>#(Zy-Lu4gX|-dSG)&LEeU=;PFFisWOD`h zA}+yXFeyR{=_NM66y5`?yZPS2uqNbAc16;e9JlJ7 zgHjFaEenw+^GWC~;TpPzSS6TaabBk189SGv;LM;VNV>y1l(oqzvcqbdm1>H(W`cv0 zpf1|^6*#wEKRoZFW42z zX`d+aS_*k?c+}^s6kV8k=6Td;sJXdqBi$qaa9+^4ExFSw%}Wr}Z2!KA%WKn9{3($#hd=1EW#(S%PL~L>(E@!o> zBuzEG+$)^Xv$X|i7b^7kv3E@k7q2#|e}nVoZQd<;CH#qIrYCRBv-RAWJGOz^(ZS=E zXJ6~YYrj-ABg)bz_tmB?#?DpA2c_iPd9o_wmLuQt0vrfCJEj!3&qx@mOB~-)TwZ%) z(5njs67j55oBR4&Q%nSgyu$WMgt=}+;rLfQJIeUCa+bTpTo zttz#?oqd*j(#Z0#s7IWi{`^U-D?X2dKT1-d+|ZF7A8b)dlYEolyksA~v|{~sEc|A$ zeJtt%rVx3o^MNK&Gp22DVRTQ}*fORs>y7B{&XwFviI5XWO?#g_e+qiV0G~!i;8@M5 z6_~<9)oLEHke&x2RMCJ~p_-pb3h(-3(XDn^OAiC_9qo`bwu|b&7CYHcZrg>#)8zsd zDr@&8DHY|#@S5v9Ke?Qty0^X7+?i={lv5ZP(lCA7f`q;2UbRO;2G^8#cQORO1)(dt zpDleUy=WB^oY#XrX9}sd$0ReX;PZ$|%mX6>-aCJem7|OH)_R7gSj?nnM{I@Qc!=AeR+Maqtt-omx^on`KaAH%_8 z`UV9yTrV5$_GprRl`Ct)kH-y_kr&FIgkCn~|2?WCse^m#C@a{wVNJiA$d{83&jQ&O zqAE8^YRLZYAO7BCmX{mLOiQ-yDdG4om|d zxW9|hJn0Gwoqpsh)6|)f_EqlshpNvo<#WDM+wiX*C(JU25>1d|J(p9bT*TbYA3rU! zP_;Bna*Mq9*ePQMH73PMNcYMyqA5(@qbltxT?99l^E zY4qs<&fDHfVkjWN-Cj#vt2QM%fdQc)EO{Zt54c7T}ltgb5VI|S2K}m^!C9qv*L7}Jvk!jKQff6p3%0spNn8zhMHhYk3BW527^sUP28 DCG2}g literal 0 HcmV?d00001