From fb74743ce6b0f6fa970baf222eb054051711f571 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 19 Sep 2023 16:46:44 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=94=E0=B8=B6=E0=B8=87=E0=B8=9F=E0=B8=B5?= =?UTF-8?q?=E0=B8=A5=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B8=9C=E0=B8=A5?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=81?= =?UTF-8?q?=E0=B8=99=E0=B8=9A=E0=B8=97=E0=B9=89=E0=B8=B2=E0=B8=A2=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A=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 --- .../Commands/CommandReportRepository.cs | 1 + .../Reports/CommandType03Response.cs | 4 +++- .../Reports/CommandType17Response.cs | 2 ++ ...4-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp | Bin 2315 -> 2320 bytes 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index fa1330dc..18c794f7 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -725,6 +725,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionNumber = p.PositionNumberOld, ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiFullDate3(), Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + Remark = p.Reason ?? "" }) .ToList(); diff --git a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs index cf743393..99335098 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs @@ -1,4 +1,6 @@ -namespace BMA.EHR.Application.Responses.Reports +using System.Diagnostics.Contracts; + +namespace BMA.EHR.Application.Responses.Reports { public class CommandType03Response { diff --git a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs index f154c95f..d1fa5811 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs @@ -19,5 +19,7 @@ public double Salary { get; set; } = 0; public string ActiveDate { get; set; } = string.Empty; + + public string Remark { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp index fdba21375615978c9af8b66b8379787026e2ce4d..492282fa7cbc45891836924ac2cc0b076fbd6aa2 100644 GIT binary patch delta 1974 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 I2mk;80N`M?<^TWy delta 1969 zcmV;i2Tu5q5{nWTP)h>@6aWAK2mtbkBUccA*St;#008nrkr*+5n_F+&HWYy02kbv+ z8Zc}Rl`Q!Zr9E$udRBvKy~SDvo!N7Jr?ps~+`Ym3r2@Sd0HF<7ZH9?E7HqO*}uHCn9wJmjU!O^uA z-*JY3=b(DaZSj528=MtIx7!D%>Ixn(fTMpebZt{~ux9u@QLe~UQ4%B`evspoEf1J3 z{s{vcz*BXj4Z0pID0dO)y}sAt>q4WpG%kjgOhnY++(}h`SkM7`-kQCau1};{66$gd z2`+;hFjzr9JN5wn66%#E3Vov*L-@_W|26Pm2L8{1|0wYP4g9Bp|0?kR4E&?O|2r7n z3;Y*Y4keER{{Y86#lk0n@8gV6au|$$4E*Q8=waahfd9XWR6R=MI>J9*;6EsQfP)8& zl%oTzAC~QZmq;5dz)ykyI`IEO1s=h?_wVee4s1CO+F#gm-63$ka(b$z-&RozqDH;T zAq}wnqX%3v^}21Es-VdnFLA}sS z%Y4Fi(0Xle-vAu4;i{qcAh+wlf~ufR03@la8bo}5Mb|U~OlF4JH*L!!ALv}<+OQ$jm;Y79J{6DPka;?E{25(!2VWU1F-*)qAR3e|?h;z}0eW@C)9htx<^ zz1M7QpRUY0FbtOxM#VsJ+^&6V%hJFe{20%z+s4qe#$g!Q9;nFkqqr!TQVErYod9ws zMr_)Dt0bWsRw?0B6`AQ&35ROIGHnmd>%jT^3yOm(t5mr}WTc-Pf(aFCwxa=ud>U1w zZ5z7Ab8EKe*=8IJD@y{qVM~zEROQenwi7B}Gt}<)W91|mDklM=oP?$-$7TwZOQ@=m zY8(g^U1k z-+u>KTKHVQ+E||30am-7eiQFfQ_#zmvfD4IpPTyT;;CPnVXtx$?O7JFCC53+Pcg@e z$U16LLQokeP+>&sEGS(YDrK~%ULYY#*{Up(GThynnlhdoy_1yj$W$cd60?<{m6!%m zVCTXx5|pMpgtX37W<^Y$MZyv~7I5fOQx>Dgb^;sL;DTch2dN5Uj&an)?SPYz1S5YV zM1jNFW_@|utOy_Qzs5HkUXt4e_<)}tK-fdZTOQ=cYM40fv@aDKRu(v@EO1CU_5me( zILRJNa)y#j@bfWd%ynktIDI5r2;)bA{|4WQdBL6Gl0kf3<^bQ+Iijepl~k8hkE3#^ zX7qnE_Rg?-ZcKE~6`@&UUL>02`VfD0&*(DPb9Da-U;4s9d^ruGjU>3O<`V#2>gHFaGxJu zQT`py+-ZN1PoY1YIMZhhn=_l9acon_^w`AF`iwSl{S=zG?DAMjPa5~lcg#KN)Q-?o zii{lzsac|*slG%%&YX?DB4$sHXIduqj$`|d;U-1)J&>EgslY#YT5u1K6K}$|NtC}7 zahGx}`2Ma1XD6ERSZCIqywra=eIcadcXZTax%6wgL;Mi#VYDZ58106{Z`Ix~298?k z38g2@O?x;PmY13f9&J9(p(Kayx(O063R)OKb6~ zuzS9&TAJI1vgi@|I;2jwhW60KDO>!eYPd0^$`#e=>4_8bNbof=3*LexW|3o8lLQ%W z#l&_@9-S*<*LdntE}(qiX1BJ}H=-;6)UwX=GayLN2_l>$r01yAOSoF@KwewpGo@h74f z=mq|XC`jUA|Nl~+loX*930M9DP)h>@6aWAK2mtbkBUgz0^m&u52iy+wh$B}Jf7iTD z2LJ%_LX(#WE+6uUBUgz0^m&y4006cC000vJ000000000000000mXqWNCI)y200000 Dza6iN