From d5670f11fdf1e36444363d7cafd249386b67dee4 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 6 Jul 2023 10:30:32 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=81?= =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A2=E0=B9=88=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ProfileReportController.cs | 25 +++++++++++++++++++++++++ Report/Profile/rptShortKp7.trdp | Bin 23146 -> 23223 bytes 2 files changed, 25 insertions(+) diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 886ea21..d24f5b5 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -149,6 +149,31 @@ namespace BMA.EHR.Report.Service.Controllers var old_ocid = Guid.NewGuid(); dynamic ret; + //for (int i = 0; i <= 20; i++) + //{ + // var s = profile.Salaries[0]; + // old_date = s.SalaryDateAnnounce.Value; + // old_position = s.PositionName; + // old_ocid = s.OcId.Value; + // ret = new + // { + // CitizenId = profile.CitizenId, + // Prefix = profile.Prefix, + // FirstName = profile.FirstName, + // LastName = profile.LastName, + // DateOfBirth = profile.DateOfBirth, + // DateRetire = profile.DateRetire, + // RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง {profile.RegistrationSubDistrict}\r\nเขต/อำเภอ {profile.RegistrationDistrict}\r\nจังหวัด {profile.RegistrationProvince} รหัสไปรษณีย์ {profile.RegistrationZipCode}", + // SalaryAmount = profile.SalaryAmount, + // Education = profile.Education, + // AppointText = c == 1 ? "(เริ่มรับราชการ)" : "", + // SalaryDate = s.SalaryDateAnnounce.Value.ToThaiShortDate(), + // PositionName = s.PositionName, + // OCFullPath = _profileService.GetOrganizationNameFullPath(s.OcId.Value, false, false) + // }; + // data.Add(ret); + //} + foreach (var s in profile.Salaries) { //if((old_date.Date != s.SalaryDateAnnounce.Value.Date)) diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp index 1c3b227383b3d987ca35248a63ce858c0818cf11..ca7f2d4fa9959e57a43272e1a373a9742e90cadc 100644 GIT binary patch delta 1628 zcmV-i2BZ1vv;nuZ0Sr(}0|XQR000O81);GF!%_|fq25*om1polWER)?*F@KuP zbJR8z!0(;u|KRbVIkecjo82U|yD*zT2!(u1mcm)s%C3sPD$6wKshprawlGZSspZge zV1{=3;ruuLQz|`KySD5tA*9oWcqTK^dy=0%-cQn#wEfHbzGvLWG$vs%FxytkG;rXA zE(yj1GhurdR?N$n-hZ#Zi=&V-<9`lu*<@gLT2{~TO=AoBcwo|qjV3(zMzm}i++Gk5 z%n4)B$F?0i6YQhdV%Wo!+_Rj}w<(z771*6tXVGq3ZIjnv82#%E`!OWBu!F{U10xsH z5q21Fow0$*c)|u|%j%Lq)g9@@a${hlXb=>)@IG4&_fNfHcUSXC#&(hzr^rtL+2#Lci{Q;D(vh?RH{WVLUWa;l&`T%mD!yi{ZQy+di z%Q|`h`e(x0(W5MVsd~j^I}3e*=8xEchYit*p-0BtUu!sEnDVw^KA;Zra`h&0T@RN( z=AW;J0n016wPB19MR$|H*nh%bn#PEH#kK9Fh?&M}=()TEO|WU$A z-7dM&uJ}>qT)_+xuj<^DnRDG@kvDN{XTDRd&djY=yWrTtI>DYBTO;HldT<3Xta)SQ zb>0v){42g#M_ycU1~;-AQZcTw9im5DVSvR)jD^0EWWQy4SB{7j=6{%53%!s^bE_V5 z?#=AwqBNKbxy4+XV-ma~O}1sPq(Km*IY{QlApPd#RWaz!#h@dFf52cTjETTb_(%ic zVgte%1EFUv9TSCa4GP=Ndg6IIh)wkMxz&(x#z;8s&QQm}Fp5GFFkw*#;k7$;1Hyj_ zf*zHWf{$XzxgLhBE`Q|gl|#-_u{ViKDl1WUMqu0OEcOZvwt7Vf7cLmag7KjtTDg_@ zcQNI{f?-dUYhl8<5jx|-f)40wgO}3|CA+8NsESYIQK3)@+&02YoG4;G5D}&~NWf>t zu*(M)1#awc-E^XGgcCo2vEr>%@+d+M9C;wrU*o+aK@ui0n155>szz-hIwrx)%S!Rt zY$buy(XR5b6mzdaT2Y>h_O!o6+p_nnYf=RxIGSM0)F+_XO$y`MuMG1Ja>a>G?RbUx z)G513cTs=D4{i<%X_@JR2&)W32%G}$N8yuIq_0MGr8k)G<(}7S*Q(3gGwoh3&jz4> zjfP1yEe=u+=6_hE3sV#F)17OkT0PoUDWq*%%d^#E$?EALEuV@2 z^@vf-93H)F5+6$s5K)=^d4$K)Wlhyvvs9mETut#F*?;HDR4%U*8Z*%XuKM7MBxIkc zf72p2ku0IDX&rr4ddqzm44lT^3x-a2|1Fq2%{{na_U-rK!hF^FsR_*LxH?I2rY>C$ z?d<65EPb4%e`V=Qkj1^s9|ou&z?IBnjiAMbpmRx3aa{sD9s(YR8bJUMN9z&%rEpOv zNYg0lHGdSHPl{y5bRBxiR~vba3%A2ZkbVMJy+1>EhnT*PZXm4+_6z>7O9J;2I5_yge%KXRCp`Twh<|lOsYJd3N^i;|^Ld`MjokNIkH%sE;at6`G zIS`eCWQEZ#9+Q|+ByP)wu1j$on*hTdiXwH}HVm9eNZ|rY*!@WMNQdj>TN!U(L)IA} zYpI^Ba;U7xy6PqlV0B!6PJViC`1v35bKGco`6O3}FVxZfd&rl+0!ynu?9v%)4rT8e zW`D;Ix0mOH+q;+%sy}J8n|q(LO-lLsT575fjD-i!x<^U*Bq?9LD=(GvexT6NUL;H9 zY9Ie^lbGD~aIMSphE-qQE16oWr!Uo-(zv=Gi7*d-W?XYUVe8flhH_2*06cy0?c4H4 z$(Q~HP)h>@6aWAK2ml44-c~LQij|@O0F$*?<^lzwlbu;c4h5m!Rvoub^56vk0L3hm a@mVec1)-B6S{woGlRjD|2HaTy0000J>?KS9 delta 1542 zcmV+h2Ko87wE^n10Sr(}0|XQR000O8gK@D8!%_}|ao$!EwZ@WNx9TRJ!7$oe3{N6xa-xq$coQQR z(;;>k*Us3)WHe?Svt}(5U(Frr!!ltYBQFpbyLg|i2m5Lnt5&U57qVuemwyC#2k!|& zG=1^hVkSUvd7 ztn1_u_{T!p$&)nsMXicSJ#%XT^@r@h!-iNy*CQituMO-oOu25DZ>WR3jJ-`<*Tcn! z`QyF7XW0b1o5m1P^dR<)9e@0VX$;AioLg^(%rw>m&*dX%j7`HXDqw>K`5m>hEuC$; zT`;3PXGhg@12aUtdE>6mjO*ryyoq5Oi;ZeEW@feOIm32(1bc2|4UvcF!41T)W{uU? zSwqb5uh^o8ylBoCT*!Jr#lA{C#ENzTAB%?=3nq$^>z3_-+!0AE5P!E3cmb8-);;7r zoXN{bDKH~4i5ay(Bv?g?tjkqNfj~%c(9DEE`^}Lz4};}}Flb2PA7IcAA|hZXY@`8U ztpdUY1Hy{cJS7yCOQ3Mq>BXMcM{KP7=URn?3x;@g z1%e)x6oQX@$k_`5R(}?9E)_%0!mzs1C_f8G8)7B`-N@*p5YyYl=LYL8^K~KLjU3LK z+K=ySJn=Vz*cXdb^e{vYMB)&EZg5->KMvvu#HnYM`rC+(h(8O96ywtwz#(WKs5MD4 z13a|V=4Yfm-LJfC8PlnyNfuaOIL4T%M}RYkb9QOZnW>LlaevWJjyPxLM$yc=iQ7Yd zpKw?}i$UN)h*gIn2>$+X90;4NBmE^Q8@2RPj z_>4q57t2DQjF9u{<=8qJ8~GS{G&fFjMS83(cb+&brdT+}tqHeg$F$);vP0r@A0dXQ z1>Vp4q<_m)&VRFR6(Xv-)tb4_rnRC+RNPqsc!!K)=J3OFn@q6WX(A@GKMV0_`c|oV zOFYGShIJJ0k$vNRBcpqSMoehHS?_%w2kc|@Hyv^Z$q|~*Z|HveE!{o{I1kqkg3j0d z=R}_85s(x6_Qyc(z0~nj5*L)=>MXH=y7M2|>B(1V@_#f<{^Iv|pha5X4+GeTkP&#Q zA!w;W(3M0`-Y)?>9s@j%Gz0;FIJBO?FM&LfK$?c4l?p{y6GgIP>W7|lZzHpakeob$ z_A|&d{s6tN0AI&qm>6&*+9zMj9Hxe;W`(IMiK&Kc=g&6ocfKv=vwu#LKY@J7IT~zR3aDU2!?G3`Xef%v~L&l(tebA^0IW`npR?cIEByQq z@pIZ}xpkHl;!AaP{|@@)M@Y&1cSSnJs!Q2rgW2iB?bd>Ddw?0CdP$>R<$W$TQi^46 z$(b)C<_eo-#Yb6slojr|isYjDctfj57RHr+9C43C