From 9ba0a05ed23ad914390a5ac805ec43b4dea115d8 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 18 May 2023 12:45:14 +0700 Subject: [PATCH] fix report short kp7 --- Controllers/ProfileReportController.cs | 6 +++--- Report/Profile/rptShortKp7.trdp | Bin 23078 -> 23098 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 4570c78..915a7fa 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -131,7 +131,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง{profile.RegistrationSubDistrict}\r\nเขต/อำเภอ{profile.RegistrationDistrict}\r\nจังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", SalaryAmount = profile.SalaryAmount, Education = profile.Education, AppointText = "", @@ -183,7 +183,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + 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 ? "(เริ่มรับราชการ)" : "", @@ -205,7 +205,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + 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 ? "(เริ่มรับราชการ)" : "", diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp index 15108b73a343ab8b8991d21a24e80e7b2255fa3a..0376daa9f291571d8abe155c50e575feeb9c8b60 100644 GIT binary patch delta 1433 zcmV;K1!nrDv;n%b0Sr(}0|XQR000O8&t$O-!%_{;WU^K)Mu~xA1polSliX5B2`8 zf4F8|yZY`syaG3AK7-~ zOtFt5i(?Nn^1yPaZ!>@r1K6EbXUT3`ZBvY37`-iy{Rn@WLKvY5-o(hoY>XW)tTQ$- znM`@#Y+1`B$j1)#ZW$P0lmS7phY$EVJ;MP4ih zOq1tn@>`nxkS33yahxXKf$~L~{Fo-crpePZ`8`dJ;OTSt2<1us;y1;k(<9KINVL<( zY4S@xE3SX+EX@VXAM-;G8*&l@k4%KWHgLc(6SiTopbqjf^)_)`4_99nuMcU!vjO%t zjWJ^AejFG(_zTk*lP`s~y&7`USf`#VdaxLqhFvwl1`En7YG+GYEV^BBqdn)x{K<99 z5%K1oyH+^YEq8et$F{92XS>zv6ppppCD-NU_Bf^!22yYn?R;<+v zQel6&h6;C_VeEM$#HV_MZZ%AJ%b0NSy`hc?gD|8d;1W}(!nwP3Lxnd=1wAvVBp~Iq zb4V$#OFNgUX=kNdJGZDj3ZRWKm&tBqj8KT#EfNTa4VJ~cP~b+6(9QfORyOv74H^e> zlDRw%kptN{WT6{^7bJ*j906SZZf^cIViSK76sb|J__QE6B<{QUoRpXm9@_chXQDk@ zuQImE>+-276?kAg#hB->fMz!?`K34KrV(=GVIvR4B{z4fZq{Ag8;diA!zrsKf`=i_ z9~e>)zaPN^>63M&|48b3Z*t$un4^uZ4VT$7n_eat3(&jCXdKSEgOt%{BHN{W7M_2p zEV*o6Nv*T7Q_hnobN#eXr02_O<%z>%hGl5n@`X41rVZbb9TI2o5OKsThxRDTFme0ar-sHJ^)-s=m((74gV#`%iID=u&=)j zlzx{we`+#=I$ph6c95U^kL~pIt2B9%CVz?3Jjk**@P`5FBd7~J(Kxi!aA;vU)Gc#J zQsfa(D}w4h9CS7OmK5ph&K5z3UO(0&Rv$M1jP=?mc3 ziR>mj9Lx6U*Q%PSacZ^U)Pi!VquS*iPDGw>tF`T)(&SGNe-;{zI^Bjk3rd~(w0nba z;h|v5)p)Yp@MM8_a(=N@UcB7dUngw7+S;7A7MCjB8mg$9x`8iCX2szhQX8>9JyWty zqUON$zax>@a8_lpvZzXR>S=#ew=eDD35hsEvTinTU52B`1S;HPD9kUy2Z1xC3`$uN z^#e5@om#KHl?m$_Uj65J)l#>J^Sr7i%Q>@dxUmDYx+s5M{RH3e=Z*8HdcUMJ^A-Hk zjY3`3U)B88)zaKmz*!el9qlTh(y#Vb@-B(UeGk{VJTt5UqFb#QsLU{%T?J`M*yt*Oq1QP%x+YAw)#Wb)xQByO9KQH000080MBHTXjtz8&t#KXSw;=d nWU^K)Mu~xA1polSldM@U0?%ZV-B}y~aFhC3CI(+w00000HS)VY delta 1413 zcmV;01$z3rv;n5H0Sr(}0|XQR000O8?p(19!%_|IT(VXvTf4qb1pol4liX5B2|KNu ztW9dfS$C5yQz?HavIsC>z9;I(N4}pQA0OSjvG04vBg`T~gTC3eTBd;mhq@$~_RW~@ zeYj@cxc=@ty&W7<#*NR2%V&MF)3R0^-!!(7kNYMI`D7-Z-U+*=A@G8zZ_YRmKeFw} znPDGA7RMfD+NK!6FnXID`w@RMg)l}_yn&I6*#tXWSZ8ct zGM(|h*|L^NkdGbe-7+x1C*ag-+CgYspX{FElYrOC52`6EpZ;pq$b2<379;$@&g9YUkwX-EH7TvD6(O&Rl{^Ta+ zh=B?U0YDJWA3fwyNC{u7l4>=DDyi8PpnUEo7 z(kYPO7X{f?vr>Q{C^%?lV9Oo##)R|l4RuTygdrsXmzX*g&fKjVD!f%H=$T0+0V$`Q zBT9K)+PPFsJ1gDVxkcqs0BwS~Om-tRcm z%;ial9LUBY3tbnyAVEyy2;lN}bMv6YcqW zm9bS`mrqTpzyp&R#yo!oG&^z0FTDjfjgc!48+j-$xw%tyv+m;FM4TxcPFXb(JP2|A zz>tFY{RkdNpA3=yBdP1X!F?}djyAeBTxQRFdYN1-K<_rAaX9Y|QbwPtY?ty`c&2}{ zX6FY|Y$iDHu zk;x;%A}%cus`tK#DgQYCns>R2R1beG=6CeC{f1#504^f*1JK2W{}SXyZUH6OH{S+I zze}AzHJL#juU;=Z$WQ)9c6#!4nmkRDzr|@DWLX^e(*X4$)CHbu99n8PbY(fzEptdx zNMjL@NYLvEd=jV_Nw#TBT4|VcMVZvD#G>aS;;4EelqpZ3{S0c3Kfr&}m%y)M z*-dshlI@dkR5erM)M~@2tI8==F)8nGBJzA!t!@9DCVzqWi_mD)={D54qSUERyVnU9 z9tt*HjVH?uPp%M8&MvmfiQbd!Llt#XH}GZ2tT?z~vc?!0yGRPT|LX0cLVx;dz;?yK6qx5Z!9cKxN+i%12WgxAsFBLE*1tHCex{qn8|jGEH`qGQTa4Bp