From d0e2416175bc857156f7a268ed3368a7d878ea19 Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Wed, 4 Oct 2023 14:38:06 +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=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B8=9C=E0=B8=A5=20=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=80=E0=B8=A5=E0=B8=82?= =?UTF-8?q?=E0=B8=AD=E0=B8=B2=E0=B8=A3=E0=B8=9A=E0=B8=B4=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ProbationReportRepository.cs | 17 ++++++++++ .../EvaluateChairmanAssignResponse.cs | 32 +++++++++--------- ...Ģāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ„āļ“āļ°āļāļĢāļĢāļĄāļāļēāļĢ-2.trdp | Bin 3830 -> 3809 bytes 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 57ee1409..c4bfa0c4 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -202,6 +202,23 @@ namespace BMA.EHR.Application.Repositories.Reports if (evaluate_assign.data != null) { + evaluate_assign.data.evaluate.achievement_score = evaluate_assign.data.evaluate.achievement_score.ToThaiNumber(); + evaluate_assign.data.evaluate.behavior_score = evaluate_assign.data.evaluate.behavior_score.ToThaiNumber(); + evaluate_assign.data.evaluate.sum_score = evaluate_assign.data.evaluate.sum_score.ToThaiNumber(); + evaluate_assign.data.evaluate.achievement_percent = evaluate_assign.data.evaluate.achievement_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.behavior_percent = evaluate_assign.data.evaluate.behavior_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.sum_percent = evaluate_assign.data.evaluate.sum_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_orientation_score = evaluate_assign.data.evaluate.develop_orientation_score.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_self_learning_score = evaluate_assign.data.evaluate.develop_self_learning_score.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_training_seminar_score = evaluate_assign.data.evaluate.develop_training_seminar_score.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_other_training_score = evaluate_assign.data.evaluate.develop_other_training_score.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_total_score = evaluate_assign.data.evaluate.develop_total_score.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_orientation_percent = evaluate_assign.data.evaluate.develop_orientation_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_self_learning_percent = evaluate_assign.data.evaluate.develop_self_learning_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_training_seminar_percent = evaluate_assign.data.evaluate.develop_training_seminar_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_other_training_percent = evaluate_assign.data.evaluate.develop_other_training_percent.ToThaiNumber(); + evaluate_assign.data.evaluate.develop_total_percent = evaluate_assign.data.evaluate.develop_total_percent.ToThaiNumber(); + return new { No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(), diff --git a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs index e40d274d..e48a05e4 100644 --- a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs @@ -105,26 +105,26 @@ namespace BMA.EHR.Application.Responses public DisciplineLevel discipline5_level { get; set; } public BehaviorLevel behavior_other_level { get; set; } public string behavior_other_desc { get; set; } - public int achievement_score { get; set; } + public string achievement_score { get; set; } public int achievement_score_total { get; set; } - public double achievement_percent { get; set; } + public string achievement_percent { get; set; } public int achievement_result { get; set; } - public int behavior_score { get; set; } + public string behavior_score { get; set; } public int behavior_score_total { get; set; } - public double behavior_percent { get; set; } + public string behavior_percent { get; set; } public int behavior_result { get; set; } - public int sum_score { get; set; } - public double sum_percent { get; set; } - public int develop_orientation_score { get; set; } - public int develop_self_learning_score { get; set; } - public int develop_training_seminar_score { get; set; } - public int develop_other_training_score { get; set; } - public int develop_total_score { get; set; } - public int develop_orientation_percent { get; set; } - public int develop_self_learning_percent { get; set; } - public int develop_training_seminar_percent { get; set; } - public int develop_other_training_percent { get; set; } - public int develop_total_percent { get; set; } + public string sum_score { get; set; } + public string sum_percent { get; set; } + public string develop_orientation_score { get; set; } + public string develop_self_learning_score { get; set; } + public string develop_training_seminar_score { get; set; } + public string develop_other_training_score { get; set; } + public string develop_total_score { get; set; } + public string develop_orientation_percent { get; set; } + public string develop_self_learning_percent { get; set; } + public string develop_training_seminar_percent { get; set; } + public string develop_other_training_percent { get; set; } + public string develop_total_percent { get; set; } public int develop_result { get; set; } public int evaluate_result { get; set; } public DateTime createdAt { get; set; } diff --git a/BMA.EHR.Report.Service/Reports/17-āđāļšāļšāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ„āļ“āļ°āļāļĢāļĢāļĄāļāļēāļĢ-2.trdp b/BMA.EHR.Report.Service/Reports/17-āđāļšāļšāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ„āļ“āļ°āļāļĢāļĢāļĄāļāļēāļĢ-2.trdp index 0647a44ad231d8d805086dc9708a29ebc230201f..fdee544631bde02b5eb10f1942b8fda4d766bb24 100644 GIT binary patch delta 3452 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 delta 3462 zcmV;14SDk69rhg@6aWAK2mrWyJXb(g5_dTb005ZEkr*~C8UH?D|AXKGMS`xf zCBHAe7P(8)1Z}n;mu(-0Ay91QPN;0TvV6PjQ!^C1k$NS6d_+kPf6v2*Z$Eb4JMCM_ z32;WHJ=iO0YNe!rLD%k?gQLCD*nRL$tMuNx-~V3c4j9^wtNh&TxyMkhu2#GKlJaAt z58zev9lfN$f(E0#(y{9fe^f4yy2qezj8qp`z%f5oyLP|qpfX^|Wxb+T%etzSV9|=w zx#@!b2>pbA7uSGmnARcay6}~h8^Am|cF_~-^C$MgGC?Wm=5R?U;Vw9J_w7^i;#F1i zOChCJ)P{fg5qRKV_&@L3!{FD?3~LM@B;GQ6Jqtu{ zg*RWf2X0XQ-5biG;TZSFgWHE6mXt&D*M1c=hOn%C+v-69XADY8Ir{W6dVE+j_>rMWHAn|u^ z@@H@Im5+_-AH2zLyvZwXau$LR%sof9;B<(nKO!J~jY@cme*X*N%A5WU-2&ym^QNDp zd*S8pXGKxKYqNAPM<6GYU@Q!$GGBJzc6z{n2_Wt3;seLFPk;|W*R}ieYpgSJbq8yd zT&6w%)~)T}2kcu$_v3l_!6hy}xClxQu2Ks})r||+u=U`g(FHCT{S1oLl2j76uW(-6 z(&l*y;Dk34bI4~Ydcl^Wsnu3yOWC__0;@Mtjqb4tPCy?F+Bq6_TkgpUDdA*$-^L`NFP5(qAyq+2163W{PWo`9Pu8RTr3mV7`7>D{A z#HkY164hK(UwrhQ4(iD_C|<`g_ahWxzd%9!ENX|r{S*b_MMdqkRt6K2_OiY9qOWr+ z5QS{DD6d~EGS{=7*U~S3hQ_!a`Top*{~!9Wm(VZLIH(ue`tt|1BC@-PnOfn#p{X}> z`G)#}n8@6d-^J>$^Q&K9M)m8kX=voD{slV(vib!g>1y$#dyRI+CW8#_-3Q0UiD^6c zhQR5mg#4%TZ8iFJwfaGuCG_6o3`bMA(X`UW$90zq#g zQ7=)?3282V!ZLeA!;mA!OYDE zml*Mk14d)ZRrVC^hss-@jBWQy8UI5r@!!joW$1Fb%Enp-%ssFNJ=0%JYFO88r*F9a zI@P3_AToEx3G;EO6LvviB8xkJ`PxeRIQ$UPf|!dhxnu|_@1G8#72qYoTni~FKY^jY z;o8n#>HSZ}hBY&+O4`e&y$h5O(Ql_LUTdp!ek&NIU4rwgWO9BQ(~YCImCjE(zg=>E z+DiMN0PUsiulw&)2;nz9?XhhU*W0rwt+QWR^utp4z zT#%zLz`ZZcsk6MDUw`m_TgJl}c#!#`tjJFJc`~Ed)j2petsb*Hc9}>1Z?@ax2y>hy zPnszX4JP3|J18AGMCK=uOlGmXI|FBkvZ*Rz>pw7k!J2Vr35_4YTN7KV zSru8So7k`y8h!B_dwwIA(8O`;G`WTtv!2;%h+ci4TtTz-_juEP(BII8BTP2&%HL1q zr<`YEqo_88Ygs&YS3WWafOJTp=i=c*cp3i=AgQ(}l619MqZcW*bWwVWERYe|k(PB+ z$0pTq-j9s5H&($lJ5FDn2 zc6Toq&62wgl!!*yaq`TZ&lxnV-yqhVFHl$awNKX*udLu|00BG~+s?ysgSCF6THxlm%; z_RCxZ=TiDWS$t)wqf$hbM*HmN`H!?SUjVAMw>!Sl2J;3+^>j?GM_hpLXXO1fv_Z}Ts=AE z0{+f-VP6x<-q`^h&&jC33)De>iBcY+Tzb}{AvU_5=I?d^8P$#P2gtyJ9s5lW4vPYjIpjN@ko_B(B2En0^t>n7|%_g!N#N=~KE{Td)Hy@v;U7 z^f8*X3@oobZ~`oQc+YlBSf_@+^^{2pSd(mj-f}E4lD7^F$BZ_3LF{w5>?QZBM1Lf2 z9hi>ubZBVokAU^yo&^kNU=EI$o}abKJ$N69eTn@Q@g6S&`>tb{81|rV4h%N!x6atj z8N8B&zl1+$=zJ64Z@b692^j$c{B`O3CHNzG>u_jQo{_igF@Ih5cqR5DdFya~)iSVu zAC37r=$EXg68(`pk+5eI&`*Uu9QezqU&23)1b*23~6bRJeH+3HlabAQ=AhE$a%6uL!M}} zu{NPdhV!tHJlP?7<6>@aEdz`Mx0mgIV21{Wyi&S7>GpQa?a6~31P^vV+jK+@cBqI+ z&H_IHNzTy@>wdVxx=P7IALOAAoHCCJKJ=lMt!z$En(0IdzPO%EoXO-S&#MR(mb$68 z)oya5+~_7taawv_gS$a=v@1NXg5G|cR71Q|29h?IG~4n>inRdC!begx)K(>b`{vrr z+|(@*f+opLUEqNfj3L>oh*wBDk)pLQv$W*t-!@j=6`x4K7=jamdCG|tt%ZrACDL~a z=@(ASOi}!Dh?(1Ji#_%XPGFMZ0>+%%FUr4ELL1zf8`+U1Z>YBOfnwwA$)wMWfkVS@ovXB8=L5x8XbWfj@+)9vmB{ z(>Dg!VD0r(BtUOz}pPG-L^+);F}4#s=hT!(%81todK0p0IG%*i`+sg$`0^V?ur|A&8RP3y<~G zi#j8rt}U-!UHt5WI8ynsQ5~D{;#j=}fo41Y*J(_sGBvabNX?+XrTD~+ZaS*m_LoxB z0xd8`8fkwub_2XMO5~$|EgJNtM|P>_xNL(?xc!7{rUSYVHyXdAP~ThyX$VL+ z6=ck+Fm%w|kQSP)_z6D)m30Wv0?Uzd+ZY1pLvsLoidSn83C5r|>cX_yO0)y`+2&wu zk4H$9q>~rBWjIG>XpJFB_-Ozt1h+e(SH%ERbre3#<|M)k@jB&jp`CL0eQ^>}>ftc} zF1ZDzL>8FFDiMBvcdzHKC&DkLhvq)?XwA{J);RCgu4%ifMh8C1;hocT3^xo z2EB%lC4Ix~TLBoTr&Es$-e>lC!S!4L!SvqTiIE$r^Z+N}(V&pplZ8nmntDU1|DHis z7nGg#)-uYcmmeAbPnC}L0))l&h&Y)Ti&Pv*eE0uQO9KQ66aWAK2mrWyJd=41;SRWa oJXb(g5_dTb005ZElV}bu1GsxUlbH@10fCdX4kiX;4gdfE00{TQeE