From d3059d8f1d3014271fa4be22ec35d8610b916378 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 30 Jun 2023 14:21:27 +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=B8=9B=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AD=E0=B8=A2=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=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 | 4 ++++ Report/Profile/rptShortKp7.trdp | Bin 23098 -> 23146 bytes appsettings.Development.json | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 7c7feaf..886ea21 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -105,6 +105,7 @@ namespace BMA.EHR.Report.Service.Controllers p.FirstName, p.LastName, DateOfBirth = p.BirthDate.ToThaiShortDate(), + DateRetire = p.BirthDate.CalculateRetireDate().ToThaiShortDate(), RegistrationAddress = p.RegistrationAddress, RegistrationProvince = _context.Provinces.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationProvinceId)?.Name, RegistrationDistrict = _context.Districts.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationDistrictId)?.Name, @@ -132,6 +133,7 @@ namespace BMA.EHR.Report.Service.Controllers 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, @@ -184,6 +186,7 @@ namespace BMA.EHR.Report.Service.Controllers 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, @@ -206,6 +209,7 @@ namespace BMA.EHR.Report.Service.Controllers 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, diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp index 0376daa9f291571d8abe155c50e575feeb9c8b60..1c3b227383b3d987ca35248a63ce858c0818cf11 100644 GIT binary patch delta 1567 zcmV+)2H^R+v;pe00S!<~0|XQR000O8gK^%m4Z>0mgK^$gO{AEGlLY_(L@SfsQZj$d za@#f#zIUeYz~P~nwxlH6lHE$l$W9cyi5-pPCTE0%B{UStf?#U*RG*Ue*d~*)dunrN zbLdRk=@0!je3SwULLwomaU6GA+nmviunTapzEwZ@WNx9TRJ!7$oe3{N6xa-xq$coQQR z(;;>k*Us3)WHe?Svt}(5U(Frr!!ltYBQFpbyLg|i2m5Lnt5&U57qVuemjr)#2k!|& zG=1^hVkSUvd7 ztn1_u_{T!p$&)nsMXicSJ#%XT^@r@h!-iNy*CQituMO-oOu25DZ>WR3jJ-`<*Tcn! z`QyF7XW0b1o5m1P^dR<)9sGZVX$;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_-+!0AE5VwC3cmb8-);;7r zoXN{bDKH~4i5ay(Bv?g?tjkqNfj~%c(9DEE`^}Lz4};}}Flb2PA7IcAA|hZXY@`8U ztpdUY1Hy{cJS7yCOQ3Mq>BXMcM{KP7=URn?3x;@g z1%e)x6oQX@$k_`5Ru+G9E)_%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>LlanXNJjyPxLM$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)&a;1R6(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@-%-<{^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~zR3aLRv!?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+9C43C4uf&tR!yXsg_8vU07NU3!C5XJgK^$gE)0s5q5uE@?*IS*6951J0000000000 R005wq4q7G#k68c!003Ig<>~+c delta 1525 zcmV0m&t$SzEJlfeV+8;J!6uX4QZj!} zZ`(E$zYo}V5OmmOn`AqGoNjgtC#{>TO=`qhduAoZ<|>IAMRmze%caG3AK7-~OtFt5i(?Nn^1yPaZ!>@r1K6EbXUT3`ZBvY37`-iy{Ro;u7@-N?#K^^L zj2$klGd3}qOnKjIS<58I#}4&w85m%c0YR~c5BNGg$fvPpwYqJIRX{IE@iu?nmx65W z(J*V>MP4ihOq1tn@>`nxkS33yahxXKf$~L~{Fo-crpePZ`8`dJ;OTSt2<1us;y1;k z(<9KINVL<(Y4S@xE3WJ;%>~RK^Ft3CauNfNOoYESaKJGWwqdcL4)QYfHgR1KS6>#d z4{5-&0robHF=FU`92h(J3)6oXlP`s~y&7`USf`#VdaxLqhFvwl1`En7YG+GYEV^BB zqdn)x{K<995%K1oyH+^YEq8et$F{92XS>zv6ppppCD-gST0w`%XI6;Z+&a2tQrqfEiAd&qfE z;ANr$%!CXvlg@wyzbMGInw0_sLBT;Y1B3RNU_Bf^!2 z2yYn?R;<+vQenA<3U{1g?0F-^r+S2LHB5NRm~ipEp^gcIFr*~l5>uzbxw~~kg*QqC zJu|5!Amy}kNGY#NJC}c|X=kNdJGZDj3ZRWKm&tBqj8KT#EfNTa4VJ~cP~b+6(9QfO zRyOv74H^e>lDRw%kptN{WT6{^7bJ*j906SZZf^cIViOV+sZp-@v>-Sn?z{P%l$a47 z+WF#VqCH!$GPcU=@~J5mcwjumnCGv6W;ZVRr8noM5pv~WBM*PYB{z4fZq{Ag8;diA z!zrsKf`=i_9~e>)zaPN^>63M&|48b3Z*t$un4^uZ4VT$7n_eat3(&jCXdKSEgOt%{ zBHN{W7M`grxoloZt+TOH&XXr|{j^Y|=gVs4iNj-tWoX>;g*W@A4d0O+5@+xbal|Z$ ze%2?Wn`RL{D>;8v+v*nKbJbeWb1D(6fV^YQFn7fExlMemR+`Ac?9W0xnft>z%D}w4h9CS7OmK5ph&K5z3UO(0&Rv z$M50k3*gs@>?S)L%l7Hls+y^BYPI3if^w>(+T|TiM4oS}we6qM9JyWtyqUON$zax>@a8_lpvZzXR>SDZZ>dThNH*?D%@iz%rC+R zfitBHN?8*112rF=TCcv93F{hO{pWerQn!fnysCdD%Q>@dxUmDYx+s5M{RH3e=Z*8H zdcUMJ^A-HkjY3`3U)B88)zaKmz*!el9qlTh(y#Vb@-B(UeGk{VJTt5UqFb#QsLY#P z1!+p-#z82fD*VN)<}_gI=p~>`lije)Zd7`<`a{~)zX4E70|XQR000O8&t$SzE)0s5 zq5zY$Smy)JWU`Z