From d86eb050a846600eb7fe5a87e3e144c72e5a7371 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Sat, 13 May 2023 20:13:01 +0700 Subject: [PATCH] fix report --- BMA.EHR.Report.Service.csproj | 6 +++ Controllers/OrganizationReportController.cs | 49 +++++++++++++------- Report/Organization/rptAccount1.trdp | Bin 2228 -> 2234 bytes Report/Organization/rptAccount2.trdp | Bin 2926 -> 2932 bytes Report/Organization/rptAccount3.trdp | Bin 2524 -> 2537 bytes Services/OrganizationReportService.cs | 26 +++++++++++ 6 files changed, 64 insertions(+), 17 deletions(-) diff --git a/BMA.EHR.Report.Service.csproj b/BMA.EHR.Report.Service.csproj index fa7c82e..6f6930f 100644 --- a/BMA.EHR.Report.Service.csproj +++ b/BMA.EHR.Report.Service.csproj @@ -66,6 +66,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/Controllers/OrganizationReportController.cs b/Controllers/OrganizationReportController.cs index 684a5da..d709214 100644 --- a/Controllers/OrganizationReportController.cs +++ b/Controllers/OrganizationReportController.cs @@ -46,6 +46,19 @@ namespace BMA.EHR.Report.Service.Controllers #region " Methods " + [HttpGet("oc-type")] + public async Task> GetOCType() + { + try + { + return Success(await _organizationReportService.GetOrganizationTypes("หน่วยงาน")); + } + catch (Exception ex) + { + return Error(ex); + } + } + /// /// รายงานบัญชี 1 /// @@ -174,14 +187,15 @@ namespace BMA.EHR.Report.Service.Controllers OcFullNameNew = d.OcFullNameNew.Replace($"\r\n{d.OcNameNew}", string.Empty), OcNameNew = d.OcNameNew, ShortNameNew = d.ShortNameNew, - PositionNumberNew = d.PositionNumberNew, - PositionNumberIntNew = d.PositionNumberNew == "" ? 0 : Convert.ToInt32(d.PositionNumberNew.Split(".").Last()), - PositionLevelNew = d.PositionLevelNew, - PositionNameNew = d.PositionNameNew, - PositionSideNew = d.PositionSideNew, - PositionExecutiveNew = d.PositionExecutiveNew, - PositionExecutiveSideNew = d.PositionExecutiveSideNew, - PositionTypeNew = d.PositionTypeNew, + PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew, + PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) : + Convert.ToInt32(d.PositionNumberNew.Split(".").Last()), + PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew, + PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew, + PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew, + PositionExecutiveNew = d.PositionExecutiveNew == "" ? d.PositionExecutive : d.PositionExecutiveNew, + PositionExecutiveSideNew = d.PositionExecutiveSideNew == "" ? d.PositionExecutiveSide : d.PositionExecutiveSideNew, + PositionTypeNew = d.PositionTypeNew == "" ? d.PositionType : d.PositionTypeNew, Prefix = d.Prefix, FirstName = d.FirstName, @@ -264,7 +278,7 @@ namespace BMA.EHR.Report.Service.Controllers OcName = d.OcName, ShortName = d.ShortName, PositionNumber = d.PositionNumber, - PositionNumberInt =d.PositionNumber == "" ? 0 : Convert.ToInt32(d.PositionNumber.Split(".").Last()), + PositionNumberInt = d.PositionNumber == "" ? 0 : Convert.ToInt32(d.PositionNumber.Split(".").Last()), PositionName = d.PositionName, PositionSide = d.PositionSide, PositionExecutive = d.PositionExecutive, @@ -278,14 +292,15 @@ namespace BMA.EHR.Report.Service.Controllers OcFullNameNew = d.OcFullNameNew.Replace($"\r\n{d.OcNameNew}", string.Empty), OcNameNew = d.OcNameNew, ShortNameNew = d.ShortNameNew, - PositionNumberNew = d.PositionNumberNew, - PositionNumberIntNew = d.PositionNumberNew == "" ? 0 : Convert.ToInt32(d.PositionNumberNew.Split(".").Last()), - PositionLevelNew = d.PositionLevelNew, - PositionNameNew = d.PositionNameNew, - PositionSideNew = d.PositionSideNew, - PositionExecutiveNew = d.PositionExecutiveNew, - PositionExecutiveSideNew = d.PositionExecutiveSideNew, - PositionTypeNew = d.PositionTypeNew, + PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew, + PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) : + Convert.ToInt32(d.PositionNumberNew.Split(".").Last()), + PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew, + PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew, + PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew, + PositionExecutiveNew = d.PositionExecutiveNew == "" ? d.PositionExecutive : d.PositionExecutiveNew, + PositionExecutiveSideNew = d.PositionExecutiveSideNew == "" ? d.PositionExecutiveSide : d.PositionExecutiveSideNew, + PositionTypeNew = d.PositionTypeNew == "" ? d.PositionType : d.PositionTypeNew, Prefix = d.Prefix, FirstName = d.FirstName, diff --git a/Report/Organization/rptAccount1.trdp b/Report/Organization/rptAccount1.trdp index e4f7308bca28878f26c20d8b5e2eb90871549d31..463697994d73a9f0724956455ddf1479fa7b3fb0 100644 GIT binary patch delta 1887 zcmV-l2cY=05xNl@6aWAK2mo=NtyV0SS@it|007^S7c+m$Zrer_hW7>f4g?Dn z4bYBw7u84!Y$vXb=3+=rx@M?}MVKN5a+Ek-HSHonf$mZiNjGhSY!U?M6{X*XkJ91r zBF>1CXi9)3l^dI9NS(QTJTvFl*zN0QLz{a9J>PPj4le?M=b&S{eakuN@MHAwGo8PF z?ZXe+T{v<*#C?Bd_0gciORXjl_2H1`?l~5^`|vh2{ILf+{GnqGcau{(+^NmU~2zG07X-C^)54E_j%AHv}KF!(1te;NjF!{9|2 zJPU)@Ven@d{1ygp!r=Gt{F^X%A3YP5;0KuX#rY9qvRyRO~u@cV}CL!N8UO=yrdWA3h-9FP6rFDfTQ3NsnAD#LqtBUf zQr2#qu$Nuei{9wCDN)~gu5I#V&Vk!#th1Ow8D2 zVk9mTYlcfQPYI-P&tiwfh~1IP#2L9>$qNJ|`u!0>v#C$O$iN{@Q-CgM6deVjhJ-0h z&9{HEU{PyWHWL;V$g(mAmNa(EUU^FAvn)bQ4vKPqW5nGx3pus?J@z6ws8VIsE)gf=axv{spgAAAfXq z<0}5KbG6JKTCd0rZcGi$B|;+$(mZH%yd!_o=RiYk%ek&v3r* z+{YLiZ;Z_y#~ipG5z(=uPm?ia(3KYkf~ZZG4DKD*ffFWf;NS571#SuLm0?Jj$q(0c zAKw`dA3*PuD^tv1vp2xZoMy9AiXwlh>L#@2Xx*e*h9i3YTo8+5tPUNtGOnto!!=iz zo)I%L3d@xOnvz@=tm7x6itC%SP>8G7xAo+QQB+udbRacbW%;=UA3?h!KnuSJr~z6> zfHa^<^8ktj7JcC^y9ekgGP8e$qC$<& z<>SLj3Y2n?mPR_mzU!jt17iYE=mTTaV`AE(d@aOV52EOpn$H~>Bj|l;Ie5}`6x=Vv z>H8)w%QoJwJsvuH(Fr)*$JFkP43pp|M78f>HY{iCj(y@So&L1-w+-*aawdXCT5vBr z4JE0On{L{r*i7CIa-EKSVm5!W;mZ4t^_aA0aS@q--T*?BeuR{C$GK@~PtDSi(T@%f zrjb53%Mv}y>Rf+u_ZR9Eid3vq z^$2Ia@#uEl0#9(-~hb z11-uD;~X(oBBoNuSvrQuB#zW`g-X_a%eNlbuyEd!hEYz~Rx=HZo0mxkOd)skY~(>d z{u9H=uI{i;C*-V;q-18kEiRdG%gxrjgqxKBD`wm+O)mPYEINNoRFb&Gjmw#qRxERF zwzCsW^Ru2#rZLFP?| zq@^=&Y12fTnw+YMH%-pciMLcrJg&*vG;#{^Zi<|x^KPlsS6DST>kZB&rrm0DUgBMR zhGeCgcRoc!!XgA`2*K_SZP)h>@6aWAK2mo=NlS>EU4RM{VRxFlT^!)|^0N;~3 Z2rmM0os(+_905g>hzKSICkOxl005LOn9KkG delta 1881 zcmV-f2d4PC5wsB(P)h>@6aWAK2mlLRtyZ%4NrCqU007dF7c+lJZ`(!`$L|ID9S9aE zTA&?q6G=5v0xxlGG>c(5>6xJ>5@CuI$YJXA)U<~L1$s+SB)zl^a!C-ND@uPGev}S} zi#Q`nq9p;AR9+mu(dfF^>Dcn&(I+q0a0hY!%hPj&vr z_4nUvpTLppA?|-mtA_?1UTSGT)Q3Z!yXRQw?!(*A@Bt`vg?W$=V*V)lz4~N6~*FDL94aXxBZ@N2dW*S4}*+ z%(nnERf-F4!H2|b3VLjwx}(^Vno4ZlH|zkn9fdEW@Q*0`Aqu~b!hfQRCsFt&3ZF;e z(1tv+7bJ?J3l;Z8z4$);ha#kZ|q&xZ7u@z)Pr2c-?19&%m7 zGadxa(P?z?g6F!{*SJ_zM~LTkUAx!e4-DIfJlCMR&>(#%&T}K3=+(_V23AxHbKg0z zpxyJqiR+@fW;_69o}?|AClNFyr8rFz&{|4in(}`sl7TK#biO8RJtvG}Qhy?hK4a!d zS-W|{UUpqCexsAF#AEBaw$+Qjg^)YU&142r<0P4$)SBXQ&$V4Iak*<7=GoX~Y9=mI zBXyZtQ(TgDN+C@~mN+Cv;*LC~&dBphULYXR?~e#HO&^1igG0Ke09{fkI!Zzf2~(Jw zZ>N93(yU?GOjw#gmX#T>WU*rkD|mbRmmuYgNwB`hwix&eYIcAvCfe&4Nb9CnA4+1~i12>^yuqVp=sZ8%T@_R8gLhJ4yJA z+?t+0VH$o-H=sDqyd|K7Y(6g3o6u&`k%y0QJV`Z%lnxariB0;Jvy<}i5hMR_;>WB6 zF&7Ooq_vkIBmoGjI%B5jRCD4zTFqfkTtDTje$h(!X*Vbxw=p5)W}oasWLP$5gj}FB%M!!{!=+J*#=A7_zCm23}-jRb=#?_)3aLv_~C&7$z!g8em zO_HmEb^3U;;Fc!M)!ynYZ9Vy6L==`E9Y|WMDnGa2BWN!O&|K}m2521tQh_SX0w~s0 z^tlJ?6F4-yvjxeS`&-DGoOL9p37Rc!201MtD%Fof!M*$fl+=vfoMb~v z%=GOb&)M9kW+R`jqVGh4$wq&c6p;n!4j@F?S4hc8P*|4s#3~&dz4*Rh7U>JCEYYjX zu5h~xZ9Mg^M=Lh?^qGCY#Ri^Sj6u94y9WE7l+`{&LpueBX`N{4w2E(lNLvqaD;cCS!e0;5!rwE7b@nSjJfTgmX}N)w7yE=_+>x;pOiKlt8>jDw8;CGc#v*335$XQ^S<)dT+F5{*|m!P;|bcvE3xQqEg$@W_f zCb@=bOJNcP&|;GTiYDq>Ss6@s&4a+UFGG`3g{DiK;A)oEgQXH-iw;cmm7qm-wPuaZ zmZCGEY0>D=7lRf-N3DO+*-CUKZU`~x&^Lq@AxEpp*#dHCIU*^U%=ii!Xjzt+(=kLQair>%Dp~g}-+Exf(sfTeMmb@7&2%v7UM?Llh1|{akq7;aMl}~D@?na+N{L8{0_-VGw))G zoIb}B(QYLFL(dQO{{T=+0|XQR000O83tf{@2jUG2U9DEK_ep{G1^@uklRyYB0t;P} TaR?j%Ka-9KCI%r000000xAKaU diff --git a/Report/Organization/rptAccount2.trdp b/Report/Organization/rptAccount2.trdp index 3cd11e903a56f048b8d03051afbe87ae48aae95b..fc447cc67f7ddefc1da14055932fd4d8d8faff8e 100644 GIT binary patch delta 2611 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 V000000094!LJKAa;R*l%007R((_a7p delta 2582 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 diff --git a/Report/Organization/rptAccount3.trdp b/Report/Organization/rptAccount3.trdp index c7db9cc7c12f020eccff51fb92be0655da463052..d3c8c665b7d55854a9a820e8760e3e3a9049c601 100644 GIT binary patch delta 2215 zcmV;Y2w3;r6X_EdP)h>@6aWAK2mq;`tyV#{EjTO)001bF7c+ldZ_`#7$L}ZYJ6N8C zKpT!Qs$*x417%l(A;Bi?W&=%SyV#2+BoGnL242D*F0s3wH~6&C7#h2vuMas7Sim*+IK$~TTx=a)vmx@L)DSppB8@_!#0uz@qrz%?=3s~QO_ia z<3*#-#-@2rZQ=u0!EIbscnwu|oB^tdii~PEb!!AK9r(`z|F6LRKJdQ_{J(?4`+@&7 zID8!Vk5B=AboebUKfr}If&T~o3s1fuRu8`k{FnICCxQPKpFqC*7F&B6_y@#b)LoBs zAkj(Oua19r&jJkU-DS({!LeNdwg+6;Q~*6~=vH|6n%V7IApK?d^)<)#!VB!IGacR4 zZ;kAYo#60*Wjf|p@UYMvcr3H*SluOdO}B=CWg6)wG;kY|&TfR>p4$LGV1;I40G7^t zIdZ%U*i{F3G=7Ra{d?d)#2$Tt#{s#JoXmX8teJnn>JGVW$MLQksMnNp#Z%(k*j?ir zM{UUo=f;keI88`_{U`R_6O8w>Gav1*UVwitUqB8fc*5s?$MW{io@JgSNZ-;@jRXmXmO72xp@3E)x;y7 zM8>m9IE|2tN+QSea*Rg|PsqnvYDdOM=jhOWDjK*;CrHL@j%sl&zFFX?^z=J%8<7p^ zD||B@;;Hr*RG48Odh#35`c|9I&YM$|X3+x9b1hLU75Zm_f~AdvWybb0TMZ-Xx}MlaOE%B zUi^%wmDe~({1xsZlJn5?RZXh(tcr4j1Pi4|&k{IEQVPJq)MN>tC8&{VYN|;MUXIkF za2f?eQhq%B0t4|JuSt_Rp8Gh$ew}~4l0^y!KL2g_5d@HAhG2j`A$~}$nzL$hhSYSW zNc~VaIUllDcv5;w2&2TZM>w87z~v_>c0y;<;gDSGB9#EA-AE83@e z$9YcXg>izsn>^_#$?=KwA)eHm zxFdk8on6rkR0iX#6A(GDtb(2kN~3b} zGD3~Y`$?%#p-x&vK&%u6J6HCBG4jkiAS>7@N7B@oxn7?Zkt16CrZ7rt-_tPKxi>fl zK~o>JsR>#{f~G85SOqVS&{c2;ShF)UHH%v_w3rN0Ib3QQLYjH2G(&%A$Yw{V-e^@4 zp?D{iKuAr_LkdJH#gHgwFx1g4-Mv?mmF85DyJqFTXN8uyQ%ZJp6zSe;j^j4)D->XG3O79{~4r)9xZ1db$O>rrX`20T0J|qGOHv_6mBd4R$lC zcLutF3FJ`&Rv;dxJ#v3WLu@c2AnL$1-R+t7SYwY4+=$<95*1`-JL(mwhBpH)NA3@+ zjo4#J+ayI0b&eduW6;?Jz>B_uk8F<;Bh#K3s4cyVUIvWr&%{8B>4ByPx!nO4^uFV! zGYT;Hj6Psc1v(d!fJS9mr*D<4v)8@86|zHJow{7up16Bqee8dLHe7W^gZOk@3jyk( zaw0K;KO+g3Wb+b-3wi8KoJY+_bmE0{etPmn&Cb3gX3Uavq#)80-LYi`Y+^36CAKsz zDLBKFnXo(0X)|H=_)}+sWSWnR)z zGzgD(1W{a&>S=%Iw6YZM4)bVAKVF`N({&?CvfzzlDWqh%o}5l4P?=jvEq^O{^mR>E zYIIH|I$7ynH9y}w13Arl9Xqw`ObY30e)@L?c1lIlH9HH>PFm3-M@Xms3Np#a!w~X z8Ny$yDN(=!k#nT?hK`PnQYwb7v8ft1S&EG|N5Mv^UhcdmXR-7eMJ-ZnvVT!)u98hs zTM5g^5$y)~-S3P40#Hi>1QY-O00;o7o|AJ3;ti>utyV#{EjTO)001bHVhJxFsh+J? pi2U?h($wg3PC6951J0000000000004B8un8sxRtW$A006h06PN%1 delta 2197 zcmV;G2x|A~6WkLQP)h>@6aWAK2mo4)tyY#7%610ZY|m}*k|6RNa4oN8yX^+w4{n{W z@|P~Y|6Y9;bUlAR;J&b1!9J{~+AhysckSTXt*gN7^?lIbw_IzV=eErbO#9tn#j?D< z8%R6{FX8qY{C*I0Kdn@H);{Q%Js|)N@a+S^@;VhCTZh-I$fB%NBthcgMLDj%6@X3; zCt+sCY=cc;wt(LRRsb8!Z34T!A2fJb&{2cPwYzk+$QXaNkv516_P}AV>K(>CQxrjz ztqz}<76n7c1y{f=oYllC%IE8mN<$KQm57x>%9;ouFfKz{oMTYC`>j)=jyy8-Dy zs*|{1&ES8o131*X6~}JFxm^Qp0DRa~07u#~ov8S#-D)`?`(ya?4bKgt3+!!jP184T z_T8<$@c4-5n)X+)Skk)z&#ih+tHE!WP7m;0CEJ7wZbN#oE754rYyu##lAfA?#1JJsdp1Bl;ZA0~$h7nfsXAuz`Qm>Iu7^7hJPYuc^V6mt=60;TqmJ zMomo(ZZfcnP?a)Z|B1)$F~tJXy$`X@NCNdf2#+bx27C}yW zMht)A3^9k3kujW}1tO}T8JYV}5)7j{L_`+ks-9q?3RPLpZ~~XIfAHP)@;tuP;Egzd z^iX(c439;{L)6s*JanO|RSWQVfN}US96ZB`AHu;~3Jsm1v6yH`f@~C!k?cKV$jEVV zQrpb&*LVxMKW@J<7&VJYjUniAfkz_if<%8R@@5e?j>GbCfWfvO2LQ7;&%?CLvm8h&$oZL z_Uo86m^h-~QkZYJpm3>zB2|mvQU%p0IyaPp3m-U%)H4PkcJ5qIfMh`{I(AA`xbqjC zE`G+#$}8+7{t6Ef>2+xGuBI?KYdN`*B|%ZN0&Xxgd9r5-XcPv`VnQRyLQPYOylLbM zDdXMg=NO1*cuN|M@Z7@=_N)AjEY^QFaQ!#YR}erF7lQuzi1eY<7-x&g8Pd|VBJl%) zWfYv+UgBlx31N&9%N}Bf`Us~VBj*X#ru`w62_p-EPQ8)|gjYr);qf=?ATVu*4v&k1 zDoVouc`IG%B*F2K@S!LuHDs5L9*P3FUPLO-t(op;zIO*=;r9W~HurtoJxG5bSaGd= z&&N+4KntHl<4B7&XTQ=-io@pNy6w4ONWwb&3;tiYPL2&^!O4nK6g-V6IKSidYy|9f zzjG7#TW+uo?#v9VDg$dV!7>D084nhY9!QhO+65icKNw-D961ve1=JG8&Af3l@|Xh! zPUb0xG2CqQ9fv$DR0_vYB2Fts7=phSB_L+w2aNS1RLYMPGe-z~|CK2g?Yto-+^(4uxmyN*kd(!Jq%!RR|*qM&Bq`N~w2;ufW^ zf~_?{fZjCgaXV%g_@CQu3*pc<9oRL~ZS^czoXClu)9<)z=sh;r%{brenieKdL=9Mj zc-U^=>-Vt1n1HwgS51GvZM#ENJubMOyw4-&$xW&kiw`77XrPfGErWd+X%M94WOjb*5X;K()iX}5;cb3a$ z%IxWv&J@WsA357?9yd9fxKSXAPr;5+hMg1av5cJgASWkGXN-^2<+*7Pp5O$UxTLUE zXjxf84^hz?mO+1Op>iQk*Q_|kg3pbmkWy8)I4vbmxhKi$_><(x_cc{x=qx2VdC^{D ze7JWCa&)$jEiF5v!Czy1^mht&N_o?aow;WxD`=6DQNbW3VC0DmL}DOX)`;>jP6?AJ zza*{Ku`_)LntaLxQ zlx93f=OYHr8A>%LlxeDS!_svZ&VysSN!X9UHAA>^WSi`=bb8sQ)Q-lMr9~s>L@y1U z92>2a3(YyOSu||&1e@v%^%`yQBIk^p`I2iiqe!sH{});_RczAIN|Z(eQLm8y^L_DO zP)h>@6aWAK2mo4)lYj`~4O)z?R+bmab{_};02q^R2`>U#jFX@V90O+v0F#jj6c$iR X1qJ{B000620swsg002n|00000rl=S^ diff --git a/Services/OrganizationReportService.cs b/Services/OrganizationReportService.cs index 2f41bbd..0d885df 100644 --- a/Services/OrganizationReportService.cs +++ b/Services/OrganizationReportService.cs @@ -33,6 +33,32 @@ namespace BMA.EHR.Report.Service.Services #region " Report Query " + public async Task?> GetOrganizationTypes(string type) + { + var Organizations = await _context.Organizations.ToListAsync(); + + var OrganizationOrganizations = await _context.OrganizationOrganizations.ToListAsync(); + var OrganizationTypes = await _context.OrganizationTypes.FirstOrDefaultAsync(x => x.Name == type); + + if (OrganizationTypes == null) + { + throw new Exception("Invalid Organization type."); + } + + var dataType = (from o in Organizations + join os in OrganizationOrganizations on o.OrganizationOrganizationId equals os.Id into os1 + from os in os1.DefaultIfEmpty() + where o.OrganizationTypeId == OrganizationTypes.Id && os != null + orderby o.OrganizationOrder + select new + { + organizationId = o.Id, + organizationName = os.Name + }).ToList(); + + return dataType; + } + public async Task> GetReport1Query(Guid ocId) { var ocIdList = _profileService.GetAllIdByRoot(ocId);