From 7fb14b72ebefcf0a6ca0e327d6a72947631aac5f Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Mon, 16 Oct 2023 15:14:52 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81=E0=B8=9A?= =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5=E0=B8=97=E0=B8=94?= =?UTF-8?q?=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ProbationReportRepository.cs | 3 +++ .../Controllers/ProbationReportController.cs | 4 +++- ...ļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp | Bin 2252 -> 2226 bytes ...Ēāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp | Bin 2089 -> 2099 bytes 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 930ebad6..76cc89da 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -282,6 +282,9 @@ namespace BMA.EHR.Application.Repositories.Reports ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, ChairmanDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), + CommanderName = string.IsNullOrEmpty(evaluate_assign.data.commander.name) ? string.Empty : evaluate_assign.data.commander.name, + CommanderPosition = string.IsNullOrEmpty(evaluate_assign.data.commander.Position) ? string.Empty : evaluate_assign.data.commander.Position, + CommanderDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director1_dated.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : evaluate_assign.data.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), Name = evaluate_assign.data.experimentee.name, RoundNo = evaluate_assign.data.assign.round_no.ToString().ToThaiNumber(), DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : DateTime.Parse(evaluate_assign.data.assign.date_start).ToThaiFullDate().ToString().ToThaiNumber(), diff --git a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs index 5dc32077..1ac46729 100644 --- a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs @@ -1029,7 +1029,9 @@ namespace BMA.EHR.Report.Service.Controllers report2.ReportParameters["ChairmanName"].Value = evaluateAssign.GetType().GetProperty("ChairmanName").GetValue(evaluateAssign); report2.ReportParameters["ChairmanPosition"].Value = evaluateAssign.GetType().GetProperty("ChairmanPosition").GetValue(evaluateAssign); report2.ReportParameters["ChairmanDate"].Value = evaluateAssign.GetType().GetProperty("ChairmanDate").GetValue(evaluateAssign); - + report2.ReportParameters["CommanderName"].Value = evaluateAssign.GetType().GetProperty("CommanderName").GetValue(evaluateAssign); + report2.ReportParameters["CommanderPosition"].Value = evaluateAssign.GetType().GetProperty("CommanderPosition").GetValue(evaluateAssign); + report2.ReportParameters["CommanderDate"].Value = evaluateAssign.GetType().GetProperty("CommanderDate").GetValue(evaluateAssign); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); InstanceReportSource instanceReportSource = new InstanceReportSource() { diff --git a/BMA.EHR.Report.Service/Reports/18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp b/BMA.EHR.Report.Service/Reports/18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp index 68590ab75a3938aa96044ba7e59edc09923ac0c6..7f8686156ce2a854e62d4516b4c676174b204630 100644 GIT binary patch delta 1907 zcmV-(2aNd45wZ~&P)h>@6aWAK2msG@P*-5fAIS9v008DKkr*(4snW`j3QS@XkZma&Qio6_P^GQi zi}T<3Pubn$JLmk8CWVxmu8OL=^SwOJ?|HfBxx4cDwWfh?VB66xvm&W-PD0qMS#{l9 ztw?S6`k9h+{@lBN@06Eu%d%bcsa|&*q~BDnDWNM`6O(f3j4GjO!}_{vYORlKy^7DVnc8$JQp0syA1I1bYv88l$SyXpt$!)ktfpeatYj@EpUW4NysS!OF@(xh_ojiN zNGgk#>9WOEE}*JrYhSd@rRpWJs(y=7Fx7G;qy!_C{?PJ&MHe?6KFb1jHQlJN` zrE8keCM){A4d2^>-!tFa^S$4FZxae#-`ju!X@3I$|L}X?`rfwh{RLlt^}XjppPzm2 zF|_Q$3}ncE573j${HO1Ap!|{!?A?PQr2pT3?=D~WemE6})eTrHNCLkcR7ClnHS|@Y zeDm0Ju^sI-GS+jJ5$c^1T}VlYPhn`kwg7@=CV~myd*OTgfX*`jYpajA_lqEmXYkuT zF2S6RNoMloNk*0PqH%b)1Juwri#j&yj!daukHJuXJb5q>hZ=#Q0}8Mm>W2I(e}3-{ z)kLag+jJW54ru)gs)khEHV>X2RG9SH0k!QOhL)JXrjAr#;}=pvE~E=-I_}6j9LNrU zdJoD3=11U4j^Bg8Do=gyU--HU)9yoKmoGhL!cM)nws4mGn>{-!iRm_veD8bT`-kD% z*W}QDVTZ%FILf4_2U2+sYzz=j?>kBuEdv&GV9;S7h6FU<73o>B9GylQl&0U{8{M`Q zAmKTzc^434+qe>z!WkBDOS9c3(Q-P+M!>Jax1lbuv>{HA{sBZo(CUN}e`2p{rhZGK z1W6ofD zm@}Yeml;=}ru%C#oairjG^YRHRZTy%nK!%cKzqK;$0mn7hE+D1Nih@K;gs(|`-23{ zseB!tqXXGN0&!jFbT6jR>d=7sm^FG@J|F}MwmMMik~|p+LJr3H4)euq(_;XJLSMFj z+GhQV6_4H2p~2g0fF*`*SIs)M4c)|JjpZf-xQ0SG69F%-P11wxKZ=;EJwclE&9GgEd~(>vaQXBvKw#PiN$rbUl3vhWe1%G~MXCso)=B z?wqRLS%J4W61=J!$(CQ+>y8Q8)Z{mR8^}%uNo*>zrJ$0cxRs07C&Kvf1~#nLywz+O z*u|)V)c4V;uiBP-_A}*k6xVF#d$*9^dxU6sNAcUCK^F`Ohaz<7vGF5^Lh9yre0$lb zP^-B>+Yg6z60bO-NofqgEuSsirbopsYWxCjOPb>>W2bGn3H79r<~Ar&kZ|pPgAs@R zb{qb8K<|F!r)#0zZ}6iy()bvGS0U-yCXX?8Ae0SrwlMum#*iJB<5Fs#q*+2{$xJAZ z`j#qBK608jNO|&6-LhQgFJULY?FVMv}B4dpCj>Jce zoB>Y9GVEa6f}Jn2o!#cPN6_dA7frkTzSe1)2#Q_+Xijp2`A5EAuY}Q@)Z6s%90m;B~{(RO#lhHh4 zJ{P%)o#3~i_rpuH(p>7rQzce251fi8zBXLBC zi`68kkp1`I05dh?J4xu|B3^YO0Z*!l{SS1eFuH|ts0Nu>YDAtrw8~241*{Tz0t>BT zkMfeXimTYA?{OWpq_wbpNjK{iX?BtzO7L)Mq%90==Lyle*|yq$4s_-1e6h=#y{eo2 zH?F+lDiaP!W0^g|72oYa@H%I?uGJ)UT2Vp<#7WDFNN>;tkW?EOyLh($wg3PC6951J0000000000002Fcpa>=g9|!;d002#1vdaJf delta 1911 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