From 4168b178c9cdb086af3938ec8db3d95ea90b00d8 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 8 Jun 2023 11:48:31 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B9=80=E0=B8=AA=E0=B9=89=E0=B8=99=E0=B8=9A=E0=B8=A3=E0=B8=A3?= =?UTF-8?q?=E0=B8=97=E0=B8=B1=E0=B8=94=20=E0=B8=9A=E0=B8=B1=E0=B8=8D?= =?UTF-8?q?=E0=B8=8A=E0=B8=B53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Report/Organization/rptAccount3.trdp | Bin 2537 -> 2530 bytes Services/OrganizationReportService.cs | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Report/Organization/rptAccount3.trdp b/Report/Organization/rptAccount3.trdp index d3c8c665b7d55854a9a820e8760e3e3a9049c601..f180a4ceb54f2f41f204d8c91cd118fdc525947b 100644 GIT binary patch delta 2205 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 delta 2194 zcmV;D2yOS`6X_EdP)h>@6aWAK2mq;`tyV#{EjTO)001bF7c+ldZ_`#7$L}ZYJ6N8C zKpT!Qs$*x417%l(A;Bi?W&=%SyV#2+BoGnL242D*F0s3wH~6&C7#h2vuMas7Sim*+IK$~TTx=a)vmx@L)DSppB8@_!#0uz@qrz%?=3s~QO_ia z<3*#-#-@2rZQ=u0!EIbscnwu|oB^tdii~PEb!!AK9r(`z|F6LRKJdQ_{J(?4`+@&7 zID8!Vk5B=AboebUKfr}If&T~o3s1fuRu8`k{FnICCxQPKpFqC*7F&B6_y@#b)LoBs zAkj(Oua19r&jJkU-DS({!LeNdwg+6;Q~*6~=vH|6n%V7IApK?d^)<)#!VB!IGacR4 zZ;kAYo#60*Wjf|p@UYMvcr3H*SluOdO}B=CWg6)wG;kY|&TfR>p4$LGV1;I40G7^t zIdZ%U*i{F3G=7Ra{d?d)#2$Tt#{s#JoXmX8teJnn>JGVW$MLQksMnNp#Z%(k*j?ir zM{UUo=f;keI88`_{U`R_6O8w>Gav1*UVwitUqB8fc*5s?$MW{io@JgSNZ-;@jRXmXmO72xp@3E)x;y7 zM8>m9IE|2tN+QSea*Rg|PsqnvYDdOM=jhOWDjK*;CrHL@j%sl&zFFX?^z=J%8<7p^ zD||B@;;Hr*RG48Odh#35`c|9I&YM$|X3+x9b1hLU75Zm_f~AdvWybb0TMZ-Xx}MlaOE%B zUi^%wmDe~({1xsZlJn5?RZXh(tcr4j1Pi4|&k{IEQVPJq)MN>tC8&{VYN|;MUXIkF za2f?eQhq%B0t4|JuSt_Rp8Gh$ew}~4l0^y!KL2g_5d@HAhG2j`A$~}$nzL$hhSYSW zNc~VaIUllDcv5;w2&2TZM>w87z~v_>c0y;<;gDSGB9#EA-AE83@e z$9YcXg>izsn>^_#$?=KwA)eHm zxFdk8on6rkR0iX#6A(GDtb(2kN~3b} zGD3~Y`$?%#p-x&vK&%u6J6HCBG4jkiAS>7@N7B@oxn7?Zkt16CrZ7rt-_tPKxi>fl zK~o>JsR>#{f~G85SOqVS&{c2;ShF)UHH%v_w3rN0Ib3QQLYjH2G(&%A$Yw{V-e^@4 zp?D{iKuAr_LkdJH#gHgwFx1g4-Mv?mmF85DyJqFTXN8uyQ%ZJp6zSe;j^j4)D->XG3O79{~4r)9xZ1db$O>rrX`20T0J|qGOHv_6mBd4R$lC zcLutF3FJ`&Rv;dxJ#v3WLu@c2AnL$1-R+t7SYwY4+=$<95*1`-JL(mwhBpH)NA3@+ zjo4#J+ayI0b&eduW6;?Jz>B_uk8F<;Bh#K3s4cyVUIvWr&%{8B>4ByPx!nO4^uFV! zGYT;Hj6Psc1v(d!fJS9mr*D<4v)8@86|zHJow{7up16Bqee8dLHe7W^gZOk@3jyk( zaw0K;KO+g3Wb+b-3wi8KoJY+_bmE0{etPmn&Cb3gX3Uavq#)80-LYi`Y+^36CAKsz zDLBKFnXo(0X)|H=_)}+sWSWnR)z zGzgD(1W{a&>S=%Iw6YZM4)bVAKVF`N({&?CvfzzlDWqh%o}5l4P?=jvEq^O{^mR>E zYIIH|I$7ynH9y}w13Arl9Xqw`ObY30e)@L?c1lIlH9HH>PFm3-M@Xms3Np#a!w~X z8Ny$yDN(@#k#nT?hK`PnQYwb7v8ft1S&EG|N5Mv^UhcdmXR-7eMJ-ZnvVT!)u98hs zTM5g^5$y)~-S3P40#Hi>1QY-O00;o7o~@I52;mK>o~>3vwk^ UlbQ(|0d$kL2_^<{90B3X%?*IS* diff --git a/Services/OrganizationReportService.cs b/Services/OrganizationReportService.cs index f92b295..838def5 100644 --- a/Services/OrganizationReportService.cs +++ b/Services/OrganizationReportService.cs @@ -254,10 +254,10 @@ namespace BMA.EHR.Report.Service.Services PositionNumber = pn.Name, PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel, - PositionName = pp.Name, - PositionSide = pp_pps == null ? "" : $"({pp_pps.Name})", - PositionExecutive = pm_exp == null ? "" : pm_exp.Name, - PositionExecutiveSide = pm_exp_s == null ? "" : $"({pm_exp_s.Name})", + PositionName = $"{pp.Name}\r\n", + PositionSide = pm.PositionPathSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject>(pm.PositionPathSideObject).GetNameList(), + PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n", + PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject>(pm.PositionExecutiveSideObject).GetNameList(), Remark = op.PositionUserNote, OcOrder = oc.OrganizationOrder.Value, PositionType = pt.Name, @@ -418,8 +418,6 @@ namespace BMA.EHR.Report.Service.Services } - - public class OrganizationItem { public Guid Id { get; set; }