From 56faba1ed60fafca7671be0be692d1d63b637464 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 11 Oct 2023 10:39:01 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=99=E0=B8=A7=E0=B8=99=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/InsigniaPeriodsRepository.cs | 8 ++++---- .../01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp | Bin 3089 -> 3086 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs index afadd401..a0dfdc6f 100644 --- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs +++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs @@ -5090,12 +5090,12 @@ namespace BMA.EHR.Application.Repositories ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", - Position = p.Position.Name, + Position = p.Position == null ? null : p.Position.Name, PosNo = p.PosNo == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PosNo.Id, - Rank = p.PositionLevel.Name, - GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), + Rank = p.PositionLevel == null ? null : p.PositionLevel.Name, + GovAge = p.PositionLevel == null ? null : p.DateAppoint.Value.CalculateGovAgeStr(0, 0), LastInsignia = p.Insignias.Count == 0 ? "" : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Name, - LastInsigniaId = p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Id, + LastInsigniaId = p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).FirstOrDefault() == null ? null : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Id, Salary = p.Salaries.Count() == 0 ? null : p.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, RequestInsignia = GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก"), Seq = 4, diff --git a/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp b/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp index ae3e6ad716ee2e75f746926013128c40a18157a9..7574b3b3a10ad18ce5315668fc05bc167db13c57 100644 GIT binary patch delta 2762 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 Q0hyEK3nm783jhEB03ek+cK`qY delta 2784 zcmV<63Lo{37?BtkP)h>@6aWAK2mnWYNmt|N;H^{&007pJ7c+lfZ`(!^e?Oq#fnb5+ z?xB=O{dFU?h@H3&(l~9#TU5Bsv#Qo8l#Xd+9)Bg5G=b?a!L9{{f}@4HhV zOS}36^yM)4F${hQgC}9|&oFov1~0%V-qAvn6YhJK54YSBMo&|zcaO@U2qRRg>fI| zs%^)YrP^s1wQL`m+2M?R{f-IZwN&eh+S)KIIhm@aXl zK?WZkaWuk<8#hw3TtPLc(R`LJBgA6SxmH4G*f56Ha;Q^Rj5<|OJDqA#w>>pY1Pcm! z?Q(zU37kpiiL>VFrCYON>2`IdPj;u1J5WebLargC+{Hp)W7Sfw4&_|enNhah z29Pvh0{2UX#A~($^cW4+5_;{GL$9N5R11H-nWSWD!oZ$PFv(JkQm#z;45@HN*8e7m*<1oqh2>#ly6t=O!H zh2Cf23qS*}*;p&!38`0typ5G3uU%ge^qB6v)*{{%;oDm`II62ZINNAce1tL7P2GPz zmZfdmo#?QOFY6!e)*sLZ8jHAF1TNPOm#aQnTY(*X*>P;c@~`NA&MfH&FkT=qs;jJuUSjzi4hOj*U-^lPfPAjTI|%vnFxR*-uX2K35V(ZE z=V15n6Syr1d}acl!>I>9fjR9|LEvHnm)w@?oZVP#Zgg^Y!GFTwUpTCl@I=n@~qNa3P+?Sa<2mw+{{Eg~_{8r1Axgb0>4=WcApl&{ zu#%98Vx4K85>yUgHeJ-Z((He9(u7f!c0ENJO=(BvInwkCm~akh+J%r>j5KI^Ra1bt z=vGOBUagFAE`*S**jLf3u|jxykql%+_Cy6aM_B%GsG5m0Vs6dEhMV7KatoQGQ*vFN zXZYx%A4g51m+|zea`(yi?8%`aM@?cMRQo`Y#zNPGaAG2-2RB#-nqYr!-kZ-DJzJ0L zp82tJgFtSggVx}axE64!)@X!Jp~!P`6UU5$izNI%d#sQau~EF?X?=#M?QIRsj<*2>22;rs%zlN2($Eow<*4lbsM!d`5GvAJX*8(NaVSmsg% zZEm0-l2ygQnTc-nJPd#S7Y5&j!Rs*i;e+>QS1!SSmoJ6E_hIl`c=9!^sk8UX!V{#$ z)Se}dl`{S&{CvdQv}yakJxP+$Dnxga_}o$%rxfm)xTNBqNiyo0B>0?H8P^r=8auAy zj&UOD7XO^@+$vTnij|3yy|xhbk-x&5h%?44y&xwEfL#yq4m(m132!6;E7Hda~ z+XSpv;VftqDBTVn;>cqXMB38B_!yQbOmWV0%vmq-*76nRq}O<-Av+7QB@ko5zpwH6 zZI-ck)GT2(2(tlm0K+QA)tA^ta`&2+vl?ixPlg9*tn=NM5u1qEM6$&N+)$Yj&3Nm= za@>$+hFE{+LR-X-a5tbY>hL&1@ni)v2xdqX7cfK75$7^nLvvwXh^z}@UejWq?=2$& z=>qB5Vm8tn_3DtG3;v%Eb)xYiU^MjsdTkH=5-FA1t z-2)>P>k(&s9*3_XcoRXQDXj$ds-odUB70DxmaIj(+h}Ft2}fCYb%%!l_;C}Qvp0WD z%YqyU2KpF>Zjq^_WSlnV<4!|h!WFgMEXyA|ATE$l0HG15ir? z1QY-O00;m_eMwh{{PcO10002C005J+3e^oqeMwj2=iseW3IG7slavcDA4h#jSBU)d md6fVF0JZ=C022TJ00000000000001-li~{|27U_w0001vE>mFu