From e5f73f42ef611baa6ff241c247cafd66ed2eb4d8 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 11:39:10 +0700 Subject: [PATCH 1/4] =?UTF-8?q?Salary=20=E0=B9=84=E0=B8=A5=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Commands/CommandReportRepository.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index b67be682..3748a8a6 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -800,7 +800,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, PositionNumber = p.PositionNumberOld.ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), @@ -854,7 +854,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, PositionNumber = p.PositionNumberOld.ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), @@ -907,7 +907,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, PositionNumber = p.PositionNumberOld.ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), From c2021691fc0b467e648a9b9c3e063cf4f1ff9e49 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 12:36:21 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A7=E0=B8=81=E0=B8=A5=E0=B8=B1=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandReportRepository.cs | 45 ++++++++++++++++++ .../Reports/CommandType16Response.cs | 31 ++++++++++++ .../Controllers/CommandReportController.cs | 38 ++++++++------- .../30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp | Bin 28747 -> 28763 bytes 4 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 BMA.EHR.Application/Responses/Reports/CommandType16Response.cs diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 3748a8a6..7aad88f7 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -718,6 +718,51 @@ namespace BMA.EHR.Application.Repositories.Commands } } + public async Task> GetCommandType16Async(Guid id) + { + try + { + var raw_data = await _dbContext.Set() + .Include(c => c.Command) + .Where(c => c.Command.Id == id) + .ToListAsync(); + if (raw_data == null) + { + throw new Exception(GlobalMessages.CommandNotFound); + } + + var report_data = (from r in raw_data + join p in _dbContext.Set() + .Include(p => p.Profile) + .ThenInclude(p => p.Position) + .Include(p => p.Profile) + .ThenInclude(p => p.Salaries) + on r.RefPlacementProfileId equals p.Id + orderby r.Sequence + select new CommandType16Response + { + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), + IssuerOrganizationName = r.Command.IssuerOrganizationName, + AuthorizedUserFullName = r.Command.AuthorizedUserFullName, + AuthorizedPosition = r.Command.AuthorizedPosition, + GovAidCommandNo = r.Command.GovAidCommandNo.ToThaiNumber(), + GovAidCommandDate = r.Command.GovAidCommandDate == null ? "" : + r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), + StartDate = "", // TODO: Frontend ไม่มีการเก็บค่าไว้ หรือไม่มีเก็บไว้จากระบบบรรจุ ทำให้ดึงมาแสดงไม่ได้ + ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber() + }) + .ToList(); + + return report_data; + } + catch + { + throw; + } + } + public async Task> GetCommandType17AttachmentAsync(Guid id) { try diff --git a/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs new file mode 100644 index 00000000..22a10cef --- /dev/null +++ b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BMA.EHR.Application.Responses.Reports +{ + public class CommandType16Response + { + public string CommandNo { get; set; } = string.Empty; + + public string CommandYear { get; set; } = string.Empty; + + public string IssuerOrganizationName { get; set; } = string.Empty; + + public string CommandAffectDate { get; set; } = string.Empty; + + public string AuthorizedUserFullName { get; set; } = string.Empty; + + public string AuthorizedPosition { get; set; } = string.Empty; + + public string GovAidCommandNo { get; set; } = string.Empty; + + public string GovAidCommandDate { get; set; } = string.Empty; + + public string StartDate { get; set; } = string.Empty; + + public string ActiveDate { get; set; } = string.Empty; + } +} diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index 3ece403e..f0ac174f 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -1666,23 +1666,25 @@ namespace BMA.EHR.Report.Service.Controllers //var recvId = raw_data.Receivers.Select(x => x.RefPlacementProfileId).ToList(); //var positionList = string.Empty; - var command = new - { - CommandNo = raw_data.CommandNo.ToThaiNumber(), - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), - IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), - PositionList = "", - Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), - AuthorizedUserFullName = raw_data.AuthorizedUserFullName, - AuthorizedPosition = raw_data.AuthorizedPosition, - GovAidCommandNo = raw_data.GovAidCommandNo.ToThaiNumber(), - GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), - }; + //var command = new + //{ + // CommandNo = raw_data.CommandNo.ToThaiNumber(), + // CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + // IssuerOrganizationName = raw_data.IssuerOrganizationName, + // ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + // ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), + // ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + // ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), + // PositionList = "", + // Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), + // CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), + // AuthorizedUserFullName = raw_data.AuthorizedUserFullName, + // AuthorizedPosition = raw_data.AuthorizedPosition, + // GovAidCommandNo = raw_data.GovAidCommandNo.ToThaiNumber(), + // GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), + //}; + + var data = await _commandReportRepository.GetCommandType16Async(commandId); var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp"); @@ -1693,7 +1695,7 @@ namespace BMA.EHR.Report.Service.Controllers report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); } - report.DataSource = command; + report.DataSource = data; System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); if (exportType == "docx") diff --git a/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp b/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp index 7ef4300c289247fcff62f53e53427022551afcf2..7948e7af494f4ece090be7d13ce982aecf97fcae 100644 GIT binary patch delta 1597 zcmV-D2EzHv-~rp<0S!<~0|XQR000O8$zwaQ4U=dN$zwZLW8u$}AC0vD66Xfl6M zPuo@$exJ1eVEL(i*mYu(Kqt})=qRWyiwJGC$GiBFSU9$2-?WseQnMj->=4rQBA z8LE(q`Vh)G=im6J?4Dy^$1w&1t=g^;B)-@8oO{l9zH^R!r?0KIE#*G*eABV3YLOIF zh1m_qFzsel?eNvFrqpX!zx-l)nYn+C$CZ1g!CPWog%lfYRjIF;?yN=awHj?QzpBnt z%V(;xMBA*YhQW(4I1Gc$F!(DBdSS312Hi;^)N&rwZR+0eOrxrx@&=s+R2DJ?CKNf_Q@t1y7e700cr6J(;G!{{!xItZ-*^-UPO3WI() z_&E%o{4j4a%kasf?{}E@t=E5~wz)yUL$Lpm^qoiBm(-L^(sKoDo3YHMAi^B8IrBzW zodig&elv|h9u6=Qd!C-Fx2Ve`6eUs`MM57UQAv;}lTu+~7)u{C=(*n9Wr8jZYQ-Mi zHVwmK@6jV^|H?y`WwqWiZ5BCq-Si@&Rn>3qCm>Un>>DU&NByixK# zVelODboV%`M8bx_UKj*$J$M`j+hMSSD-Telha!78|Bnz+Bn@vk_h(FF&S|%)Z7eyD z#3nCM-#+LDxl<*sQ_h6U;3wE<@H7m5#P37gOMGvkVbO34O%;0oK7Kdy?M*o7qQyPw zRS&J`q7{31y@T?H(&2wU(C1D36Ndj82ET;C5zhBf=TUl(E-ngC`z~$}VY7p)f5q#= zl+u@}oyG!KfuO{0_E6Ctns6XNNYKb^IhKE@J@{SP*w3?lOrXa128fn~Aw~?KB=E1C z9@d0CCn>_sUjl97ZG)7oXhs91(>`j*CDoXI48#V{z{DX_({_L7(&qSPN%|#T9pL(X zNm`)(iJ*NLUvcI&dUAl*hv?yJusGyRYIhgw{UuV!^nM8xd?Z+@Qmbgk zroUs<%RU2CK8=58fQy1MISL9eSCI5yq||Gq+gRNrD&2h`_Fxk;HaBULlD>@>PmsJ% zaR$3(+$#G}4#1RWD7Bk`eDePcc~K`<%B8a(CWcQBV(^=CN`lAaoLOBJk4Tv48N8;( z%I%MfR*~rWa1}_Ycs5)>mR_2-VGz~nF5KKiK8@2=UZj5reFQo{@hg}aL@Hmwd_>s+ zk{-K)g7@BHMNZP?gXYAQ&%J&Zi=;9&M&4`>n-)ws{()AM5p+#pgX zLxTa$grHdX6!NTQHh9Nl0Ptd)HicFVe|^nO?i2}PNNP(rR2hbebPOg^?~J5ePJ)2p z5bx}GtWkd#JYqG^!2<=yrk1MQHrx0bR#i>dQ*-U61Sz$99!&2Ol_3PD(N0txy>ue+ zN@PkOzAhKVuv|%z?~;5G+e(VgW%4ec443lX#XowBI~QhU!JJBN!d^-et;1W6XKpa# zj?cXLj%DF7%jIlleFkV$h(3Zw?kja3GBw9HA-{i)qw*=hGOdjq9BLychtbJmYQ;1h zaMl@z14v(~QI~l)P1~rdGbI6=c!=>E)E%~$Ibo=2cbtxoOXa-W>^Ak9rae3tloNO2 z2w)XkjzXgkBOw9-gIR}jr!B@X&=LpIN<}G2*&9tEB=r_!T#De#awmOWc?`E2HQ+2b zHcUr{<4$SV8AqRWW(hDIZ}j+6)L3~#i3%^?KZtergV>^?5Z$}QvV>?%4;m?V&1poj77n9O& vE+5HbJ6DD@#hs!6008d*000vJ000000000000000kCPv8CI)_Q00000BE<5j delta 1581 zcmV+|2GaT4-~r3v0S!<~0|XQR000O8wOKZ?4U=dNwOKY-@^d7Bp#=Z{-4>IsXfl6W zPuxZney`O3VEHL|=y>hD0M%|HE+wD@x?&+wAKmq^YvG&h*@RF<>b6J}UMjUo(KZzd zMF3pO}F-4djNR1_p6^3*SmtIiXwJ8(${GnmM#*1%0dh3ryGk1Nzl;oU13oLGs=NgWNR4{8ABv`aO$2DYI{=Q>yi})E0Lfya&2aE8W5UUW< zI#SMoU>UEIDRVswWaw!Djj`b)yvhdba@n+Md=V835*t01wGKc_L4E7F$DZ5w2ETaj z)(^8P))WWLJ5C4N-`XwNP&a>M79sQhMHoBr&6oIuPhsR7^KDX7Ta*aX*dW+W&$A{i%kpDxMa3KvJm`^8FW!ltr*-#eE7u3ih z=sRM%*}6+t%*X`OHG`j-p~1H2{siA=V2gh5fMfn}2VA9k{~o^U$M)76biw0Z7*!9v z=ziX&%%KJgqVLf;g350+H-&P+;fokLFakWMi(ZzpnV?<_}J{h?BC$}ETQx; zVQD0QIkqW5m_1N*04|(_AVg?nOpX*EXm|ezeeCD?J|a+~N5hB~Z9{+VBm97X}5F?w|%QUX? zRgH^PKt5ahX)U});a@QnY-_ZFN6#}iYHl~{^d(ftbovMu`U#6=qOfwpkoY?++u4p^ zxg8z^2y_bM8mU+Kg}TpZJlKT%%uUg#fbYV^7EpB?B+wg!#@J`c z&s=#4tM)UHkNuw^7bP@NE?xcT5I-x>!SCE94L%^}wT)!%J+09Mh(7fU3aPJ+| z-zZ%^YEDdi?)6&~QDuCDyxEOgA%l=+%JwxHBm?+0>~$~R2iUy~-eTc4BvoB)l8%iT zn)ABcqFM#`bp$KABO(9{)fXS|A?C#-;Kju2AS#z5!~uKyIu0im4N4kZw@o-JFb!Gb zxdl~+H>`geuQHp0Wwb(&64vuz`jDu^5M0JFT3)2mg)A$faVdTi7U{5DNigkB_>Q#` zRhYZzeLfj3<-cZs@_u$L%*vEGmE7#S6ZWae4r!aVx`CAy2ivn9O@kAZyV=b84A7_` zDTPMv+j1Ttg>x%%AMjK-iE&<6>CwUY(gj-!!*fDS5n8Z#pL&vT-)ofsmf@#|6 zlT9~TW5XMqUvSyRFrcU8Y!}X(Jx6pc*vgFcjJd#{D7;`C0#FtF!|Hqg0Z>Z=1QY-O z00;oJSvHfLZterMSvHf6Z$}QbSvFVlb0mPF1polu7L(#{E+4g7Hdlr;#hs!6008d* f000vJ000000000000000f0Hk8CI)VA00000;3e%M From 0a38f32fc8b0cf5b724b4e0ae4f6327388aa9df2 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 12:55:31 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B9=81=E0=B8=95=E0=B8=87=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B9=89=E0=B8=87=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CommandReportController.cs | 1 + ...งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp | Bin 29196 -> 29183 bytes 2 files changed, 1 insertion(+) diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index f0ac174f..aacdd0a1 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -1159,6 +1159,7 @@ namespace BMA.EHR.Report.Service.Controllers ChairManFullName = raw_data.ChairManFullName, Member1FullName = raw_data.Member1FullName, Member2FullName = raw_data.Member2FullName, + Duration = raw_data.ProbationStartDate == null || raw_data.ProbationEndDate == null ? "" : raw_data.ProbationStartDate.Value.CalculateBetweenDateV2(raw_data.ProbationEndDate.Value).ToThaiNumber() }; var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp"); diff --git a/BMA.EHR.Report.Service/Reports/10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp b/BMA.EHR.Report.Service/Reports/10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp index f1af0d1a21e6d5ca355911b788c08f753005ed24..2fc70802d8033944d2db01441e7ac30d75e4f266 100644 GIT binary patch delta 2037 zcmV34U=dNuVy<}J6q#zRR;h7R3($HXfl6q zZ_`E?e?Mv8!SXA3v2*OWO**xp7FLQ_yNHyby)?zadHY+zge z5ml_ZWP>oGf~4e>yrdvmBsvJf_*ECz9cYryW$bFYQN|UQ=q}7)eX-_Fh)RDRsj*^J zeon{*h|BI>14mslFm0J`NHjkqlr>ws)ii}Ue48vnU&3_F4ObMTn1z(&kx&i>=J6eO z%DNMSM)hKP<`8th#S64UoAXvI_TBN=2HKPg05=@VM?~U)h^V|1*Z~fG==!Mk%Y=Uq5qs0t2(xL;a4>_y4YbLNoQezxpqVuEMdAaOu<2qu zIja{wrSdf%k~CQ8NC?E|V>8-;%~Rj|o1g+L87`NsdR;TCbJnsTNL|A}V9n0NNIkn4 zsYpp;)V}9?FMaPHaGpcrKZ4(0@x3R3GtmZhtOw90uD0oWZ%OO|4f%iFh4vA&pTpm` zz>$o9*bXjvTC2M~%KOwR_@T*tgA?Xf=hVa9!cnjA0k_kBmv4L|@$=%AAEJu&> zB+-7edrDV2CDF19qW1juFO)r%JTxx{p4$M{BRY~?K};Ag`Xz{H^^Re#9na})SlhY< zi!HmF?J~3e>3bhC9D>n(6FCD-3(x)bI?RVeK`;x`#Xg{Q6p?>lZrVV-43h(WxA~9{ zP6~;LAI*w*8f7OO?@DnjE#8YL81D>s3e8TOn_~wXem+f@hq}{qF4-J_h<9`{owfqo zz+=DtYaG(lghbXe$TGZofw&cjMbLygYT(sm@HgU3D~SFRC<{9Eh`I7UI7rA#80uOh zts_l$fXN2vMMi&C8IvyBaPRXVfbM~m9R|`7kgvgnHw-+&_7SJdA*`y+6nhJV(aP69 zd6`1Du4HJ3VEdY2+urcoPl8_ovT+c#_srYT3@cBp> z)XAv@kJ)8wn`pfmxyYUnYeVNBf&f11BG3Zdwm|$kTlOK#5ZfUAK}KelQVLOemKCI`qlrWFV-#N;YMO4(YUXs)Fb29|$;ugrgWf@taBReI%;NejY|DeA zk$K@f^=N;Ls)Ym^o1JJVgQJmowLI}tjDkke&M>ly3V9{<((;r`kzvN*&N8RyQVAa& z_n7>Dr|(t9rO#O;%FD3Zg=dI;Zs!j3eHNgphqttu@wUpJ0RCXRW`8LkcN*-mwpfE` zZR<>Yhc!|cz+ch=4y}%DEo(Q+EG?Wsh!%P#tFeDLLJKHgOk^sq5CGTRJ{P+1Vn4aC zfGfd0Ff)~9UdT?Q1Tzp)MRHT)kvhjJAP>1p*$X(vKj2Y3Ka3Iv`^f~jaFzisCIF6w zo?{+2*>r1`tuNu~4F}uN4thQlmg3okWelku5t>rCN{Oy7qu%($XAC8W ziXDFy{sXoX?LnG90K~j36qMYMbNG~HMBiTx1rHVF`3 z_3h1lc0Nq43WcYuD1GcFk4${|uOFjieXxJGxx$j=dyusY-bBxoM32Wp=q0RJooTjV z-;+PzY$d(oHf>BTceSo95)l&o??{d46B&VVP-*Up$n2XiZay~cXmFPT?NY8ZZ@r^15?>J6E>^ai@F)V zK4AklLd+p2T@MR9G4x1*{4`~`u2p|0ecF+t1@KHsX5jPn zw~|(+uZu#(6#A%!DVFiTri={&re!A|*^rdUJ`jTZNex4Rp3*uug0$H)Zrun?*&)3{ zT&Pd9ys*yz7?*-KQWyROP)h>@6aWAK2mr5UJ6DD@#hs!6008d*000vJ8~~GEaNPs1 zW;>HUaYqiXW;<6qTjOn22LJ$6C6kkJE+4OEJ6DD@#hs!6008d*000vJ0000000000 T00000Gn3$PCI%vL00000lElI- delta 2043 zcmVKASRQpXfl8Q zZ_`E;|9#T_hm(JTA9hZh(56!hYGDP&+C@zn+K(o=Hr5QtmEy@4frHckjJ>x#3H98#?-#Shi*wBT^pc zBt(p=S<{T!5vk?Od{vSzUHtNk;VFO8G%W|+(rQkf&KtnFoKkH_Xi{yE5y^A^@!WmS zUGm%)p1bb3JD$5x$V;eFH}6yowRzRjY9rFL)glt291VL!syj~eYgx9db<$96>=2z; z+E2J@He?H!Q4wS%rxaub=OrowLc`Y`(y*aPJ6DLKYI=oK9V$DzMzq8P|wj zv+;G?ZV~HyYgRS1IhE~?Nq>Kz(xGf`St=zquIe`7P&mFc1xXN*0|9GBb#0c~z-3}M z#EQ@AhEKV2Lxdy^7B&(9@%h*cB(VA0b3ag2fF#G|ve{^;Ms3o(kC5Ck{3B7VOpJD~u=S4) z&szjYx4rhS3`U0VvH7afSp|C#7vf+u@Yccl zAG58;O)^3#vf`J3L#abaH-X3s$VEpMIgyUFK|<<+ zo0tbKn;fKlSiS@k-f-|J*~fw~d$6lE7wj!840pbK`pu7#;1CGE0LH|pj3}^?c+k)Cs;lQ- zfPr}GLePBNR)PI8-}WB&5bMDGq3DwR!b;pD=d(QWw=LVzX6_xgQ!e1ae6edJQ?ODR z2%U3Y!2^E@@B9QuSNgiDSre);-qLkH&7(g8$j`W4rC3I0KvPa*K>H-@3bY%?ZY9EQ zf;4UuE1!VwC_rTvl+FN9rC82XNW!G_0jA8F(upTX3ciq*Amxk642k)_(ESG9NXU~; zQ56Y3I_NU_xI@Dtr*cT16Z(9Jq(OeNBV+|ZEXjWYG&M0yn;C^{F}wIv@SKNm`Ls;4 z%ibah!o4kX_6cpIZa}=x`xG`3Au}sdX4VocI^qNQX(9l}VUPc00-RZxJIw%> zVgP?fOwVzP8*Mpt)6(Wh?WRqvFsh!OrZF7()W^NV;O211`W2PQ{XWbV(in!1fkN~W1 zkcdT;Biw@bg6cxo<*BQdAZqwg{bR5yR!)CRTNQmxG7pVK9?M;U@^0{*B#Y4LB4uhj z^Ll$EZ3nFWcXbQ)pU1_{Z)_j%6fw2v6eL)o_t=SNO=5NNFhcS2V|R50718&=YYVK2 zrIl2UCn&HIUh&UVTfeW>pRcyER&`nyVVb+%P-iI%8UDBBX81`SgK}_r@~Xu38&iL7 zAyVyte~kj=f|@JZ9K5EfR8^gnEfe0hn1-rLXhLg{>3dDeQ)4XUrZLL_6PTw#)=yU+ zAs{?%i9NNEV{dKzw>ZL#;W8DzLLByF$3|tfNvs>1LG?0Pq^Qso)2^y)lYyEpQ&}~m zWwvaX%Evjg3Dug_jOZl|AGjF+3|N0p1$Wjc(qaX0A2S`tY|uXI$l(S=qIAcCy#5fN zQmGT-@Fg%Z)e>L$bU;^DYwV>IFDtMILR_$n$3hjNQ!q^{{$Plj0{;N{cEJpm0X?QB z4Loi3HK(BmCZ6D)U>C>}ZZGI_0ET7%z1PM608mQ<1QY-O00;orRW?_KG{uudaOwls zRW_3`aYqi#d2LJ#dCX2VMSFL3|>007N7(PIDr From 4ae50f9eb3a362ce5bf580c6d6df94be71dd3b66 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 13:01:32 +0700 Subject: [PATCH 4/4] change report template --- ...งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp | Bin 29183 -> 29178 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Report.Service/Reports/10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp b/BMA.EHR.Report.Service/Reports/10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp index 2fc70802d8033944d2db01441e7ac30d75e4f266..4d445cd2654837898bada526b1a0b814225efb84 100644 GIT binary patch delta 2016 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