From 806eee393b8c1c81a01498c167614e22c1f9740e Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 14 Sep 2023 17:19:20 +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=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A8=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2?= =?UTF-8?q?=E0=B8=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/RetireReportRepository.cs | 110 ++++++++++-------- .../Responses/ProfileJsonRequest.cs | 24 ++++ .../Controllers/RetireReportController.cs | 21 ++-- .../Reports/31-ประกาศเกษียณข้าราชการ-1.trdp | Bin 29087 -> 28845 bytes .../Reports/31-ประกาศเกษียณข้าราชการ-2.trdp | Bin 28952 -> 28894 bytes .../Reports/31-ประกาศเกษียณข้าราชการ-3.trdp | Bin 28971 -> 28905 bytes .../Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp | Bin 29263 -> 28898 bytes BMA.EHR.Report.Service/appsettings.json | 6 +- 8 files changed, 99 insertions(+), 62 deletions(-) create mode 100644 BMA.EHR.Application/Responses/ProfileJsonRequest.cs diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index 444ed5d2..cbe645cc 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -1,12 +1,15 @@ using System.Reflection.Metadata; using BMA.EHR.Application.Common.Interfaces; +using BMA.EHR.Application.Responses; using BMA.EHR.Domain.Extensions; +using BMA.EHR.Domain.Models.HR; using BMA.EHR.Domain.Models.Organizations; using BMA.EHR.Domain.Models.Retirement; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; namespace BMA.EHR.Application.Repositories.Reports { @@ -70,64 +73,73 @@ namespace BMA.EHR.Application.Repositories.Reports if (retireHistorys == null) return null; - var profile_retireHistory = await _dbContext.Set() - .Where(x => x.RetirementPeriod == retire) - .OrderBy(x => x.Order) - .Select(x => new - { - order = x.Order, - id = x.Id, - reason = x.Reason, - remove = x.Remove, - profileId = x.Profile.Id, - citizenId = x.Profile.CitizenId, - prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", - organizationOrganization = x.Profile.OrganizationOrganization, - oc = x.Profile.Oc, - position = x.Profile.Position == null ? null : x.Profile.Position.Name, - positionType = x.Profile.PositionType == null ? null : x.Profile.PositionType.Name, - positionExecutive = x.Profile.PositionExecutive, - posNo = x.Profile.PosNo == null ? null : x.Profile.PosNo.Name, - positionEmployeePosition = x.Profile.PositionEmployeePosition, - positionEmployeeLevel = x.Profile.PositionEmployeeLevel, - positionEmployeeGroup = x.Profile.PositionEmployeeGroup, - posNoEmployee = x.Profile.PosNoEmployee, - }) - .ToListAsync(); - - return new { retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profile_retireHistory }; + //var profile_retireHistory = await _dbContext.Set() + // .Where(x => x.RetirementPeriod == retire) + // .OrderBy(x => x.Order) + // .Select(x => new + // { + // order = x.Order, + // id = x.Id, + // reason = x.Reason, + // remove = x.Remove, + // profileId = x.Profile.Id, + // citizenId = x.Profile.CitizenId, + // prefix = x.Profile.Prefix == null ? string.Empty : x.Profile.Prefix.Name, + // fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + // organizationOrganization = x.Profile.OrganizationOrganization, + // oc = x.Profile.Oc, + // position = x.Profile.Position == null ? string.Empty : x.Profile.Position.Name, + // positionType = x.Profile.PositionType == null ? string.Empty : x.Profile.PositionType.Name, + // positionExecutive = x.Profile.PositionExecutive, + // posNo = x.Profile.PosNo == null ? string.Empty : x.Profile.PosNo.Name, + // positionEmployeePosition = x.Profile.PositionEmployeePosition, + // positionEmployeeLevel = x.Profile.PositionEmployeeLevel, + // positionEmployeeGroup = x.Profile.PositionEmployeeGroup, + // posNoEmployee = x.Profile.PosNoEmployee, + // }) + // .ToListAsync(); + //return new { retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profile_retireHistory }; + using (var client = new HttpClient()) + { + var url = await _documentService.ImagesPathByName($"{retireHistorys.ProfileFile}.json"); + var responseTask = client.GetAsync(url); + var results = responseTask.Result; + var json = results.Content.ReadAsStringAsync().Result; + List profiles = JsonConvert.DeserializeObject>(json); + profiles = profiles.OrderBy(x => x.order).ToList(); + return new { retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles}; + } } else { var profile_retire = await _dbContext.Set() - .Where(x => x.RetirementPeriod == retire) - .OrderBy(x => x.Order) - .Select(x => new - { - order = x.Order, - id = x.Id, - reason = x.Reason, - remove = x.Remove, - profileId = x.Profile.Id, - citizenId = x.Profile.CitizenId, - prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", - organizationOrganization = x.Profile.OrganizationOrganization, - oc = x.Profile.Oc, - position = x.Profile.Position == null ? null : x.Profile.Position.Name, - positionType = x.Profile.PositionType == null ? null : x.Profile.PositionType.Name, - positionExecutive = x.Profile.PositionExecutive, - posNo = x.Profile.PosNo == null ? null : x.Profile.PosNo.Name, - positionEmployeePosition = x.Profile.PositionEmployeePosition, - positionEmployeeLevel = x.Profile.PositionEmployeeLevel, - positionEmployeeGroup = x.Profile.PositionEmployeeGroup, + .Where(x => x.RetirementPeriod == retire) + .OrderBy(x => x.Order) + .Select(x => new + { + order = x.Order, + id = x.Id, + reason = x.Reason, + remove = x.Remove, + profileId = x.Profile.Id, + citizenId = x.Profile.CitizenId, + prefix = x.Profile.Prefix == null ? string.Empty : x.Profile.Prefix.Name, + fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + organizationOrganization = x.Profile.OrganizationOrganization, + oc = x.Profile.Oc, + position = x.Profile.Position == null ? string.Empty : x.Profile.Position.Name, + positionType = x.Profile.PositionType == null ? string.Empty : x.Profile.PositionType.Name, + positionExecutive = x.Profile.PositionExecutive, + posNo = x.Profile.PosNo == null ? string.Empty : x.Profile.PosNo.Name, + positionEmployeePosition = x.Profile.PositionEmployeePosition, + positionEmployeeLevel = x.Profile.PositionEmployeeLevel, + positionEmployeeGroup = x.Profile.PositionEmployeeGroup, posNoEmployee = x.Profile.PosNoEmployee, }) .ToListAsync(); - return new { retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; + return new { retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; } } #endregion diff --git a/BMA.EHR.Application/Responses/ProfileJsonRequest.cs b/BMA.EHR.Application/Responses/ProfileJsonRequest.cs new file mode 100644 index 00000000..6c19f255 --- /dev/null +++ b/BMA.EHR.Application/Responses/ProfileJsonRequest.cs @@ -0,0 +1,24 @@ +namespace BMA.EHR.Application.Responses +{ + public class ProfileJsonRequest + { + public int order { get; set; } + public Guid id { get; set; } + public string reason { get; set; } + public string remove { get; set; } + public Guid profileId { get; set; } + public string? citizenId { get; set; } + public string? prefix { get; set; } + public string? fullName { get; set; } + public string? organizationOrganization { get; set; } + public string? oc { get; set; } + public string? position { get; set; } + public string? positionType { get; set; } + public string? positionExecutive { get; set; } + public string? posNo { get; set; } + public string? positionEmployeePosition { get; set; } + public string? positionEmployeeLevel { get; set; } + public string? positionEmployeeGroup { get; set; } + public string? posNoEmployee { get; set; } + } +} diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs index 0dfb6a88..9d56912b 100644 --- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -42,14 +42,10 @@ namespace BMA.EHR.Report.Service.Controllers public async Task> GetProfileRetirement([FromRoute] Guid Id, string exportType = "pdf") { var retire = await _service.GetProfileRetirementdAsync(Id); - if (retire == null) + if (retire != null) { - return NotFound(); - } - else - { - var reportfile = ""; - var returnfile = ""; + var reportfile = string.Empty; + var returnfile = string.Empty; exportType = exportType.Trim(); switch (retire.GetType().GetProperty("Type").GetValue(retire)) { @@ -89,9 +85,10 @@ namespace BMA.EHR.Report.Service.Controllers { report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); } - //Add Parameter - report.ReportParameters["Year"].Value = retire.GetType().GetProperty("Year").GetValue(retire); - report.ReportParameters["Total"].Value = retire.GetType().GetProperty("Total").GetValue(retire); + report.DataSource = retire; + ////Add Parameter + //report.ReportParameters["Year"].Value = retire.GetType().GetProperty("Year").GetValue(retire); + //report.ReportParameters["Total"].Value = retire.GetType().GetProperty("Total").GetValue(retire); var _profileList = new List(); @@ -123,6 +120,10 @@ namespace BMA.EHR.Report.Service.Controllers var content = result.DocumentBytes; return File(content, $"application/{exportType}", returnfile); } + else + { + return NotFound(); + } } #endregion } diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp index aef012060afd5259920fd4c4b88b7124ed69e64d..75a2286d57135cf1887173923690d5a7d04092ba 100644 GIT binary patch delta 1687 zcmV;I259-8;{mPV0S!<~0|XQR000O8+EOmD4U=dN+EOl8vgm;z0|o#9s~D56Xfc0S zTW{Mo6n-DD|3GNKusu|=Y$tJ6yG4^;*UOB^ZLvqzVr-$ZBuMg_bSSWF1=8;Fuyxsx z6)4aYL%R(Hwr=g@f1{tW!$Z-MWhQa6^a2D9bx5AecfNB(v3Y!L;F8Z+7&*Sz(oDUg z5$1J$+wpoWZ5Xc}X=ulfz57mcg#~|p7?Z1x9rt0~e0QLcOLV|mTFpFSYQ*aMH!P0^ zXF|trX`OJ$Gy&DX>j21#PDr4@0)(uaR>D+5;U1{*R1cJY(uts5@kO z`_dUr!ifIMc<|u@TZQ4gzQ7+ke$dh?d<2eRLaZ)zSv&L*HQ%GIMlL!7)>#k0ro&Ad zf!C9m6pU*HcNL)Q4ourRU&Mbxg$I}92o%K~wia_xCRiimt?KnW;>tMQnqK8&1goW` z$^A5WlqP?s$wrzyOOq#Qayw1#q2y_rY^OR<4f^D=|R`~vVYbTGw&xxbB2d4i`M|XeFr%jTMzT&&N z!9zC7*Kma}dk5tk3e8;G11T3c!C(h%37x;7l?_z>4?Y6S&vEcbN=7)omyW*8WBnjk zz>R={-*Dd!rX;uXp@3jJGmv>KY-~z($%>yTcZe16(tt{v&0G8*2JRE`Cc z>M9-+PO}rP(}M=K%)Eb?h1y|KJ0o#XX7y>nB&+8Hk0q@ug1>^+bD~8dvFG$c(~P)= zsxq1@3~C$dJd5a}W7{q}#E7K-ylIrRUT{1nf;;JiqL;R`Q&$yA6&f<>%nd+U{__*X z|07c8F_P-gE9sjwd4V;%iNfdqzfib!?!d3e>^u0og>FAZEBk-f?#u-aH6e1v~TJA{`2k4K~f(s{Sk5$E>nh#wE5*jZhF)h)3@uesxvXx8+4y*hEY z(d*U4yxvXGB(dU6GjEGA*HS*LEcy0&+52VYx=~3ez2I|X#lLaRv)LN-7L6?X?r`Ac z&oF5P6u_y;Iq_(gQ9`BS=*tg%idjXI(<}4!(m|&&r|N%ol|rv;Weo5`8{S`&Ic}75 zBJ;3^XOJX`#lc`QUolMcy4hGfFifjM*X0<2W7M!o#q+54|kdpPAv z)0leoLcF2J!txp6knaoQui|S-OzQaAxS$dkf5kEabq8)GO4ZNT5z@)(GZxD&C|Ma6L7Dm}Yg3zF+Gmbc`4zTwY@h3Fi@5-%A5J8J z-|ff=BJP(tnK{r)G%6K?YW3N8;AZqMSuY!z%lsLKmpw}WWT_nc4^T@31QY-O00;ou zQZAF=Z|(!yQZAFxa7PZ>QZ84r=z$;u1^@u77?UP(E+N`dE?0&$#hs!6008d*000vJ h000000000000000;cftv@NX28iE$7H&~E?$005lNHunGk delta 1926 zcmV;12YL9d;Q^oH0S!<~0|XQR000O8q-Ynh4U=dNq-Ymc55e15^#%X{nH-a@Xfc0T z>u=Lm6#qVH|HG9hp-pIZoF;8L5)dupF&>MW0NO{B+$Po>JF}h9@@d_WQnvA7K!KL2 zTFWLFsM5x3&VS=SW#^vj8$WWJhEg6<3D@VIdmg|0yT`|N`Pfp&BHvTjGab94=xRO_UPWp9e)kJa^BQg1F+A0$7In>U)rQm2 zT=WCpwR|o=rRl1!fO|s9XMEc6a0nMCsBf57jW&D;o1CU*tL;NnC3Px}tC@e)iLBt_ zn!jw(;Ux%8I<_Azs-Gq`!!@q-Y;u8Kg(S>tl%?DC6{5u^w6u*>a44vn4Zr8oIcJHS z=@>1rq2d3Y)*a61>LtVKQMG#Elp=t|_(eW=agHv+a9W*V7j>swQF3eqf#DX_8iqxy zu7jvKwqYscyxF1kS?O=2O#gGpiplHxjD@);;8 z9*KPOY9Y=zH_UfR&9gCrRZ%L3zUw*ukuZ1=1`osFA0Qjj?=dp)HcEDohXGDK#J??} z2ID6<0Li~$a5D^k38b9lgRnGQ1uv#TgykyvKdHiewy1cPn##cgh&mlZVr0xtpP zmpFJRBm*4Z4hO%+xqccOU{1im-?(lYwRtz z$k{E(p5v_MWH0i)~fiQ?)p3wdcamnfWgIQ>yZ=gnr*q6e6fh@X{`tkrX-O?h%B zOqW;Kit^=UiBXA#NIG#@D5%Apv@lG|%EBEa)gz?afuFHo!r*@up5{IZU%vSfV%}K* ze<9~r@plcw-a#*WpX!N^9y1JiFnfLBb`7(6g!!!_3@H$W^@9taiQ49yS z!U3$k3%>*nJqQPVG_e*1Jb)DshzQ^@df3Lx=cxA#Q(6=FUdJeK92E$D{?~ZIEFy46 z(r{%}ZeiS!%2R)_QJbQo43XOq`*{-wYbbdhtzxnFF}RIHtmAJKPXvsJVZ3{HvB<&H z`Y3jwcaMzbaDRUZym;drCOQ$rG(;BgcZZ~J#yjYB1tZ%)6D&SZT2a|QBKRt(m}DLN zX$jL2xwaBFQ5jcJk%jvwGHn&%SP{%$CrOJV42pu=Q4@awPTnGek%3 zUjgd!K6_Ir-iPv$If*RwSGa@w=rcCa_Z~Hnyq89U>{jHm%>|3;xp)d$7cB!x^bB>! zH!R*Xki&eQh)A~yyMM4ec`bu|xWQF2{Y7!F{^F~i=bMYmZ@a;$8&|AhgP~8Ug+e~{ z0HGH0v+;kOQ|B!Q-aBtHB8pJ27ogq=J=(aMG1}a2Tt~2C7G493~Fw=ka?IW6=hvRF4;AlG^y3}RL5;X zH<;ezQg%F)xn{09Kl*yc5Z z@#^cuI160b0GT>C|?P@F@JqzXewrMq`=Hw<@ zXh%*}x$~IpPdl7%?u4|b#6`h4_hvoDg0zA?v4-p3OIsBauL$0)~3`KOHi`VOM)`;P*ydX>{D43Se|_*5`pdU z$*4vx0Ml_(o50?biV4EM;V?2Ypyv!Pa~NdWr~Qr<(Lduo<1UJ4m|k=p0}vI9_{mu; z%*Z3MvRCm5xaCUt>@Bp!X-s(#!lMuW15ir?1QY-O00;o2Xcv?2Zter5Xcv>;Z$}QK zXct!x!P{8%1^@t=9FsI~E+C|67gvTf#hs!6008d*000vJ000000000000000({Gc4 Ma3u!9Z~y=R0LI^yO#lD@ diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp index f2f7deb8429311203739cff3a90cfa97dd286bfb..132a00dacf99a96a61832a94009eede9ef920b7a 100644 GIT binary patch delta 1707 zcmV;c22}Z&;sM^_0S!<~0|XQR000O8wNxU=dNwNx%wfL>rfGzI_wJ{^;;Xfl6W zkJCmJey`O3Fmj~|9WzyDri6$gKQNYPc|&>ow&*y(HNlHJEmt!f^zG}P|-*V~>Q zoC%53)YifQ)(}(eMNO?oY4DL@M4cY)+mTMOi$n6c-tqfJ2wIsf!>U+S!_-ZU8AGUX zj^cg2?ybWMA zwIqI+#7~m=_axp*;+IMMa}wW7;=3Sup2Wi>j$!Bt{O!nTtom+`V#E)R%Z!lp97Rw4h{9xnMG4^xv7_4E#eFE{$u0jEg7}tC<=Xez2A{(fve8>0-%@Di+8#-{0EIOkgDs)+C$O>w%KwBe!}Jw2 zo=C|E+IN%Doh-0JnF4NvDfk7}JqG+UJBJZKFiZ`k9t#`W(w^AE9awZ1F_(3=mpc0L zG{LSD>7QXc{0bccL$`k+AQ6oS>+xYE3zLevsHv(F@uE5Dk}l)p73@(QYWrEJX-Vc~ z?VcTAS)&VjEnlP+QH`QV7xe15Omk0wh_APlv0TB7rx<6Y@mwU11K~Z!NQWIs-wDI6$K_MiSNNM z|J2PT!wx{a?^%DBR>E9Qw3!}4lX~(=G=)0ufs5N9c?vGRgiLt~jpy*UHN{<#V1EG~ zvT6_f43m#_t__-#a31`BhIx%MOfK1mP!G3DJfnQqcpE%pUvtOD8nepY7OleTmR_@# zGNv)bK?k_TG_%7EJz}`0k+ZWqmf- z4r~TaRgQ_SSw;zzinnq88mbsoP^?~AtQA?dR$oxDY$eCA%`_wY&|zoL;vUz_dm{H? zif3$-Bo_0*WWHgT7Im|}G&fA^1J~skF~@AL-3y8Lx%?1PfNtq+KxgHkGYnNy zFN-(ya9BPg?DH2+;qjT!9|RMCK{CKl;ahYjo~(a`#!8R4j#8akWf%0QQ&l~AH%3s; zR+a%vktuFAKu)}_G6FfMRJ+^Cw6I{fv>|Hr(`27b?h5IR^a6u(5uyQjRExU``nDTqB2(|10hv$jsG_{j8mMymDL>-%7 z-<-DHh@T$WMiXz~4@nq&eFWXV67*w;*(!QIff602uT~JOq0dN2S000<( BHcS8j delta 1788 zcmV{Z{zqz&qZJ2Fmimaspx7& zLD*~iw&Qi0NacnuRiQ6#=8=b{YryJ9#)LJbM%ocx@GBYsS zj5l38>Jq_e-;1+JYiE&Zh1Rvchc4k8WEIX$Of3hog0$R(R~ElR zJ*z`(Xz)MMg3*YsUa{OhR$G_OC>+@;jh`EDwiytg4t0O21zv|^A~;usa3!GZ4ou5DFJd9XgGzD)MDZHlh$$$A zMB?i;)P;P-mC<^uszKWTR#R!trOBf-d737FkVJ#j`vtP^9!Oq54kj@46#jO&8fpIq z4I+7&Cf}vW*Xi&MA0ofs3Yu&>v9p~Hze4CM0=}5d zAHmBO82<~p1k=~hc*-S1Xx~eRck_iE$_-E_#K5mG?+M_a`#FpNftiAQD%0n0P~`qS8HO`R#qq-Fy5)qwmNY`=& z6XGHymaXTaW7{s?$Mx{&DI=DxUT{3jmUhw!*@L2~oVqG8DzSf%NvCEvU0tf`GJacN zcnbXXfEUYq$`K^ZpFs&chyDPjy(U~o3g-KC_z;1q9jGf-O9M9YARYdY4(}fn$7I31 z4UTyvHsWoFMCmw&D9gBc^bUi-`#nei9Nz1;y zS&n`MyKYnx@+jySTJ>+7^K869NKQd3zT5A4d7liLfknWn@-f!c%P4_S_Igj>VkM&z z##Ji|wIb=(>hm(vt%!ts+QF_JseWja6Kipg>*YP+`!FFgvPm3^*+|(#p$q)Tp@;c0kyH)>D*Zix z%2<5!EGt5#9|Tm!djQq+tktnR=cYyT>T{u82F}=5;2N6jG07yc@cX zhxvcWLbk*5^c?{_c2FK6Jc00LO4sVN8JO?O)JdC9dE?BTkYu}LQ#M1mPbyq*X@&bO zcK;=4G+I^%n>eP|WD#mv0S?bQp50VV)JV2io*lI z_C-*}UdmdQO)n<1zzljP#{=8re$K=$0n-l)n?S$k@&Uvy%xE%GpqH(vR17lhvvJSO z(!b=r@ELWl5Yn*Nd000LblVxx&AA5W(SB5mjouU8$0Pg?* e022TJ00000000000000?ld^Co20L&700010AWi82 diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp index 09beb8c67d6e1e8f34592ddfec1565a875138a35..2919650d77467c45204582faeef78e9aa6395c95 100644 GIT binary patch delta 1739 zcmV;+1~mDr;sNR50S!<~0|XQR000O85+sEKL!8*Q5}=6XfuD0 z(?%42uhjoAa-|9$7{|_KlahegV`!l-i07M*-H{Yrkr1(a zj$zvUjx-9^4>hHuM?Ul7${uK?wq&)UR%Hb%5;cZU`%FNF zJ~V0PI0<tHyu&%CEXek+`Vv0 z;xJa3|2!V(oFnVBnMAhcxE-m&TGTPv5UriY!r!BCD+*sk;m=X{Z4}-C$+IXNM_~vi4`%(B17XAhk#$d6m@Z*m*jvuB!#}309I{bfEG`R^rZKEiB z#I&-3CsFtkEc^@N_=Zho+V|N8o5K{+(VHOO5@=@H9&&jM$_v0TD_fxaC3GpK zub}amOD5316HRVsfgQ*cFe6mKFR<YS`5d#%J|*TAVh6;N_OoP@ z;>^pmf$kDst#w?>mudy8S)tZ(H7(ORZZ%pN5&KMsDvak6p{zw2EQ#s7X&4sS$C!8o zj1J3M&zUxf!#i$z@l&EBowzJeD$tNfXHi>$))d^T=4ma(s)2uNF;*$9-QxxFp7H_$ z>Y{1?6#8RW_KH#*Es`Ii$$bQ>cA%Ex`WeR~_oB&<(d6!bfL9&}c?Hd&liMOX$szHN zi3LHVf57^u401la<^;NR1EoZRV9N8@R*7`#dy&qkBR??LH{Uet%q%4p*ITNnl$tR; z@j_x-FwQ@GbGd)80|@VX(j|qkQ1;FBAez>b&!HL2aTi?N2FVj}@df0`6KFhxzpWYW z#_9DZ;E@*XJ2=YZ!(C{P7Nnf}b5TyhhyVAZ49ex(7)s(+iD-mxAMb)_^ea|+yiuyS zR#OWvV7R8XGOD33qbb=a3a)2IoPg;m2es@Nn`Qr3h-H8IB_a2NjiFWN+8Ns*8Vpyuino+=-UyGj`+P#V9WvsY8WsDNd0rBN#qZLL`s5p5+$vz;U-9M7Pq z(c&&Q%e%sNVuojQn>ZGW!KA!lm>O7VwibqIePme-BkGuLYXi@;ukvpr1?XDu0y;GZ zo$@xItKffTy*V#*uH&2RkY1*e%G-cSc@LmcmtH^1icl$U11j}BfNFl$>g%?7U1xdq zS*~3MPTg1F+Op^|(2kK2JRRbJDW0D8s5CQ0X7QQSRiRgHx}^e7sdT!y1=dUR;>_NA zp4h`FSK9K_qnF0(*~BZK688D4XYBDQ&l$N>fI)vUz)<1)bS9pzh4#w8v<#s-vC2N^ z5vQtn@@|YEo-Hf`nj$mYY=hji`@#tLpiu2@E0e;4;nIeP(NB_n&V31H?Z`}SnmSQU z9Vjcf6@Shal2d_mmPFjROUkB$kh&Ks?|PPL6MnJ~?XWm~Q-G(A$|=G#2ydZutUq5uE@ h?*IS*6951J000000000000146|8OP-3~&Gd000M)OlAN8 delta 1784 zcmVe4@nWiOqqHJ|muQxlT*ba7jVL z>AI%n^jgX&*!ZBXoH+jOJIysRbiIE7U9rrdPxWfufr2g?1JY8W@W&{87KL9$;SW)` z7ll7X;r5b(I(_$g$1#SdJ)wbch&prpmeLP`;fJc~cl%^u_&6Xo@vLjO>kd>8 z{7~CGw$49o72Za~9EXNcA72P`VQl*MI=I*ET3nA{1r zY?9tm!70}Xl1b}lP{;6$t0M=D83i>DP1Y?;N+^MRZ5WP@HNnXS9SmQrF@G%#4APS>zW+j9Xm z*D-7bU9bjZeQQX4TFj+7bb5ar6T!J6gew8%U|`yvb0QWpJeVXyKoqZ&&47Wz>!^xr z)tZ>Ij+Yu*mUju4E0r{J9XCo1b_c+tEr5N}fjHH&OUSG`_`$=?tcq|%x|GmxC zWAx|bF_=S#|Bl8tA*LM^g%6okHt;wKpM!^gK^|W+Rc8H=eJ~wnkdEF2`L@I|v-W_? zV^E#}jv=@CJ$Ts$Uzo+%^?i(<0VWCvB@o`Fn*p)Pr)EeVlZxDC_i%A>l1t#TBuCOIXjkw~EVY?^bc6 z*2vh|XEtolGD>SnP8TfGw8-p0#p0YTyaC~ z#UuBk@psYq?tg%2?n{XVP2rc@GJX+|n1^YQoN5*q5Q4P-;G48P%1TJkU3UY+PL!#c zl!g#Ycp8UMq@;i9izw;iksnwaTd$gvrZ$?6s|{V&X!V%9vNmH2v?o5Rg-Y26{13e( zlQx;FHfMTnP1+GFYznX3g%Ec@@)$yV28Ht&E}p>O_LOkrdix9TNL%_1?0m#@=USsV z32ApGLQ2^3f41{koVM>lLhbEAd)zAWj`aQIP4JF!)lPr+LRuMDDthh}4p;O>#ys?O zHsu~o!_{m*6fir*q?TQCs~GzHJd@|=QJTzfQdvU@t%85$Ix zG9Qa?wIWVnG=Ax4FSn9W3F+cet&->6O1&!M-IB<WqsZ8MB$V20D_dzN#Je_hEz*LV}q=>l}x>wvC=>(%@yRhEZJdmT{eZvj-ZvsTY=tQ!Wat51aMB5?Yl0@qY! zkAY^4jO6JM4@~g%WJCqc6q)%oX{geunsiAeky3x@WOGZr7xd!FezBfB!ii9t>cpd$ z=Ic4cEAA2w`MYTx@oCQ;4JQDDVt}FC7w$|v*$d5;zGa(Ib8?eCup=*3x$;4bAlH_* z0WFa!VKzZ-IX!6xd{AokpqWWy!Ej+g76IQ(dEmn1{{T=+0|XQR000O8&3r7ADsS!s&3r7A8*oPs&3r6Z4klFzfd&8o9UhZ# aa4rMQd@Pfpa2o+%lf7^z22OAQ00008NM-u~ diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp index bbb55bcf8c11d25efb2d68c24102735187cd1c3a..5799b2023cf448b55dcdbd3014043d8993949c2d 100644 GIT binary patch delta 1740 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 LB?fYF00000cV+PK diff --git a/BMA.EHR.Report.Service/appsettings.json b/BMA.EHR.Report.Service/appsettings.json index d6921d83..169430e3 100644 --- a/BMA.EHR.Report.Service/appsettings.json +++ b/BMA.EHR.Report.Service/appsettings.json @@ -26,10 +26,10 @@ } }, "MinIO": { - "Endpoint": "https://s3.frappet.com/", + "Endpoint": "https://s3cluster.frappet.com/", "AccessKey": "frappet", - "SecretKey": "P@ssw0rd", - "BucketName": "bma-recruit" + "SecretKey": "FPTadmin2357", + "BucketName": "bma-ehr-fpt" }, "Protocol": "HTTPS", "telerikReporting": {