From b8e6a589e0ed35f4e47d68b1e00b09d81556b9eb Mon Sep 17 00:00:00 2001
From: "Harid Promsri (Bright)" <harid_pr61@live.rmutl.ac.th>
Date: Thu, 14 Sep 2023 10:03:21 +0700
Subject: [PATCH] =?UTF-8?q?fill=20=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=B1=E0=B8=A7=E0=B8=AB=E0=B8=99=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B7=E0=B8=AD=E0=B9=80=E0=B8=A7=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/RetireReportRepository.cs         |  12 ++++++---
 .../Controllers/DeceasedReportController.cs   |  24 +++++++++++++++---
 .../Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp    | Bin 28514 -> 28388 bytes
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
index 420ba8a4..35932f9b 100644
--- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
@@ -164,12 +164,17 @@ namespace BMA.EHR.Application.Repositories.Reports
             if (data == null)
                 return null;
 
+            string Prefix = string.IsNullOrEmpty(data.Prefix.ToString()) ? string.Empty : data.Prefix.ToString();
+            string FirstName = string.IsNullOrEmpty(data.FirstName.ToString()) ? string.Empty : data.FirstName.ToString();
+            string LastName = string.IsNullOrEmpty(data.LastName.ToString()) ? string.Empty : data.LastName.ToString();
+            string FullName = $"{Prefix} {FirstName} {LastName}";
             string Date = string.IsNullOrEmpty(data.Date.ToString()) ? "วันที่ - เดือน - พ.ศ. -" : DateTime.Parse(data.Date.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
+            string CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate().ToString().ToThaiNumber();
             return new
             {
-                data.Prefix,
-                data.FirstName,
-                data.LastName,
+                FullName,
+                Date,
+                CurrentDate,
                 data.Position,
                 data.PositionExecutive,
                 data.PositionType,
@@ -183,7 +188,6 @@ namespace BMA.EHR.Application.Repositories.Reports
                 data.PositionLevelId,
                 data.OrganizationId,
                 data.Number,
-                Date,
                 data.Location,
                 data.Reason,
             };
diff --git a/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs b/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
index 635bcab1..71aa2855 100644
--- a/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
@@ -57,7 +57,7 @@ namespace BMA.EHR.Report.Service.Controllers
         /// <summary>
         /// 36-บันทึกเวียนแจ้งการถึงแก่กรรม
         /// </summary>
-        /// <param name="id">id </param>
+        /// <param name="id">Id รายการบันทึกเวียนแจ้งการถึงแก่กรรม</param>
         /// <param name="exportType">pdf, docx หรือ xlsx</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
@@ -68,9 +68,25 @@ namespace BMA.EHR.Report.Service.Controllers
         {
             try
             {
+                var head = await _repository.GetHeadRetirementDeceasedAsync(id);
                 var data = await _repository.GetRetirementDeceasedAsync(id);
-                if (data != null)
+                if (data != null || head != null)
                 {
+                    var mergeData = new
+                    {
+                        Oc = head.GetType().GetProperty("Oc").GetValue(head),
+                        Number = head.GetType().GetProperty("Number").GetValue(head),
+                        Date = head.GetType().GetProperty("Date").GetValue(head),
+                        Subject = head.GetType().GetProperty("Subject").GetValue(head),
+                        Send = head.GetType().GetProperty("Send").GetValue(head),
+                        FullName = data.GetType().GetProperty("FullName").GetValue(data),
+                        Position = data.GetType().GetProperty("Position").GetValue(data),
+                        Reason = data.GetType().GetProperty("Reason").GetValue(data),
+                        DeceasedDate = data.GetType().GetProperty("Date").GetValue(data),
+                        CurrentDate = data.GetType().GetProperty("CurrentDate").GetValue(data),
+                        DeceasedNumber = data.GetType().GetProperty("Number").GetValue(data),
+                        Location = data.GetType().GetProperty("Location").GetValue(data),
+                    };
                     var mimeType = "";
                     switch (exportType.Trim().ToLower())
                     {
@@ -86,7 +102,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     {
                         report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
                     }
-                    report.DataSource = data;
+                    report.DataSource = mergeData;
                     System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
                     InstanceReportSource instanceReportSource = new InstanceReportSource()
                     {
@@ -94,7 +110,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     };
                     ReportProcessor reportProcessor = new ReportProcessor(_configuration);
                     RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
-                    return File(result.DocumentBytes, mimeType, $"deceased.{exportType.Trim().ToLower()}");
+                    return File(result.DocumentBytes, mimeType, $"รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม.{exportType.Trim().ToLower()}");
                 }
                 else
                 {
diff --git a/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp b/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp
index 1ddb6506b97274881f67726eebda1ebff5d88f55..4657c01157355257b205397aab76402a3041f917 100644
GIT binary patch
delta 1198
zcmV;f1X26q-T~y@0S!<~0|XQR000O8T1_so4U=dNT1_rj_^we?Is^a!R}Yh}Xfc16
zUu)b(5WwFH{SJ!?ee3FU|J~dr#5PxlB+g;E?X#@g+^Nw&q*ZZR3~>{1lGmgyZXl4D
z5=h8H+@{rioBb%A9cguvd=7@V;MN%3YBakuznR^UW^iTKbIJECik-k8Y6fj+g!y(b
zas25}OZe?C`r4JtpMEmfVqp+*@~wX};WN<d+MY%>EsqVgR#zjih#wEN8Ry}bx*ppz
z=2<c2%w>^thuVRsM>ro=)tilGOE;*Y!Lo!5u5sqYIE0&Z#x2J+na#l+vca6`jDxi{
zU0K+hly&k|aB_Ji6pS64ClOl>cF8r*n!;Qie`7r?o;2w<mYXm--uy}{=xBet+mQwf
z2WYR~l7buTHrzJka61U|k?H(^(K2nzW#cG7(7?A`jofrRwtY7Q%Z@axhyGMylw8nC
zPJ`Pfzw5G!2!x}+=lRU-4Psi6wUhW`^SVa#>TJC}eV{MmP!?~qT`ohDLpN!&jNG8z
zWx%L|5gTeEeJ$n>Mfyslha!JH66vu>AB%J!2S-GK^30C$ag-2bCih*)HL@DG6Htf}
zb{6`a^8@HTYP5T2fzQMR{;wi^4-p_gjvVGrV!D}lJ1p9(fq!Ir|4r~d?Kirof)`;~
z0<VzQEzat|t&0n6oFU6CTG{0Dd$_m%#;yKVqz5(H_J5tW-!PW&z88P#OE}jx*v@&w
zjx0AmFWOG_mQcVg+UmAT$h6UE71$lx?yZ!tN%c>pPsRKZmbRD0@g60vE3x+A@lW{p
z_+;6`0bEnqDHuyA63<2YLZoj{0V?GKSsg|Cvq=9C^L>19h`Z~cFf|ThN4`V$$mgH!
zu3v)7)k|XjK)LmcNdJGr_4lPYIW;qSgoYNb%L)xfr5kV1V5$skF)NnK<Fgl~?G4l3
zp_ldIw$5yr!zOs*OJ2!kk8zFH2y_o;gVFmU{SD>d)e{`QL**mX`CZ2FR3mvMCFs&y
zguE{q=8r)1q)@*R*j5%MT<}22*ODk=KCiiYBF7I^7%N*Iea?S^_IweTIe7aF)t=&i
zLHZ|NRraNuht(Hj&WQT^`B)lyrFM}lDl#&;A;|Kxh0_{YvwU+FIsP408Y(BUdwwVK
zTn=H2_OfHPwC>~|87Dp^RN`*g^_NNSB3B&vF8u(kamp)2!J5g=ckmTkCtmq~5cii6
zGk;RYH5wO&cc6b)ni0LyjVS3DzT-zhz*$spQ<{q&C9EqM%Ac|gT+3u!wnZ@+TOo_C
zJ3bIxZ9_yYe-hi4>>YBTHHd-ZCqWXUs*)?mZd%dQ@fQt{5`3K}2h+AyaupM0&?dGz
zs{!YMm#0uKLQq~58i|s>nFxbw&KTor3QD$;Qm9X46u3?&vcXhEL8eYQRxL#JtPM<P
zDQzA^l|D~)Sn2`E+AWz{8R%83z7>{fZ*b4eH$%;O&0OwJftTN_01Wi3O}_jOP)h>@
z6aWAK2mo45E|a5e?gLs)E|ZjQM-Ey|E?4-jQByhu0037Hlj&|Q16oZklNxUu0T`1u
MZzcu@ZU6uP03km<*Z=?k

delta 1325
zcmV+|1=9ND-2vj>0S!<~0|XQR000O8gK{mg4U=dNgK{lbYlU0+xC8(I+7OejXfc0S
zZEG7x5dL21e^{<i`o()Xy}OYU;uzN<juDpIe!fU+>&U%`yH#)+0#*{R8~UNG(*)HJ
zNK7!q7#h22Pyc3rN@wS8@6EC?#09rTmiOjncjkF!c6P_D8=H<z9xy+!Ja<krXh|c?
z?Rq`S-I&vce0`>=-MIewXRTE>@O*zxzPEb34|?^kqmdQUVRKr!G$X=iB0Le{dl7yR
zlN}Lmi^)iYzr|x1NcoRAeka0-2;uDxN{&(ZTunT{rS?&NASPQP+!GT}7@sk550(Fr
z!ti9q&<MbBgE_6w`QU3^54wHkm;vR?X1;Zwc0EV;5eeYa%cXKfH>jZjKtg|7w>fhH
z9Kyo_<ECYISeFAaWQkcDeGa&*bT&oa%j(3d;N<K|C}>+<KJ?kVw@Ge0<_65w@o%6H
zk~d}gooNplZLfTzB|Ot=y(SGN4$wxkA_dEA9Ue<^xaJMwQOEiL<JRe#Hf#GH0`*+e
z*2rDUVQUWuVA+y}^?|#gU}S$>&@xVg+a3PUW;qcE7d@B9GuM_#$Mns6L$}?zqY*tn
zTQ5#;=_wCc@fzFYlA0KFnU=GVOSC=>FzO&<bDGS&ID5t_d!A#iz+j&!pggi;d>Tq1
znaLe6;2N3t>>eoiLv|7LG0t<KH>go<Tm*b1PT;>1;YVPAJX*Av-3x!{vez|b<R2HH
ze`0|DP3TS9EY;71o)9wyz5=~qa#jRfxw?Rj3&goXb7?N?A!PU8nCwST01IfV|8=y@
zk}(DEM-je-om~K1yKJzFrX5@s+FEo@D8Ln3saG?QX{lC8VAp81F`I!+@;@Scfd?KG
zx3|d#Z~JWB+I*ZmFIs<oz$MO9v}`Jg2%o4UvsfE(0N){=*;`miUW@RJ2oF(V9G%Am
z&+rpG)eof<5BAg>FR-xOkT1X3T(|~bH?N7wGv)b95&os_1S6ap8Qn)iDLTAB9HSeD
zXfRX;R+$;d<?-E{%nmq^7YFHOu>xW-$ao`{JI1;15y%$K0%LzqMff|)!JAzie?aAZ
z)OjblJGJ=A(7DHaN$e4RM!3u&00GhN=_*Wcq3tt#I~DI8#aAx<(aDIN*C_*&C+ZUP
z0zV0~Kk-|IS^785ACoaC)E~uTY3M+u%TauHiw!|I_fn@da?5l(ecy8Lt1^+>o%PGx
zotLs9E3^@9xv76OD86z`y;#VL?HIFSl;LxPQFtX8oBTw+I;FTBZ=W=YqTLjx*Ak2!
ztgugE_%r<esy@HK!%L9i1H6&j0qcGoa5ZT+olu~^afORxh1SjtgmKo<cU}oQuf7y`
znf)K|(#-L4h#7aF>T<-<^kjrY8d3RMybzbJ3@a@?*M)!Sxi(Bm+t9!)dLCzfu|F%P
z&Do%+WGH{KHgK&D<FX$NNZTAR|BmGXf}2&K-gJ9G*OX0D4CoecV7WtY7@(?>E647d
z{)XkIou3kX8%Gff&}zn2jHp4&82EXQbI*xmttS*@7ljTg<8LHFQagRdxSE2J)nSI}
zQxOH+J=sm;tNJHHryR@I++x&P9q6UI-1Bn{u52yU3ljC2GPIKDd9#=b)3lekW5>x*
zuwF11`;)+npA`WuJ^D|@^?v|RO9KQH000080E2QZlO=8L1A}rclNN4A4uf(nS8Ih^
j`M3lC0NN0fYi=$BgK{mCoNgNdmXo+{CI*FW000003iWfB