From c2021691fc0b467e648a9b9c3e063cf4f1ff9e49 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 12:36:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B8=A7?= =?UTF-8?q?=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