From 776859f7bf172528a02d072482189bd138bc269f Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Wed, 17 Jun 2015 22:27:15 +0700 Subject: [PATCH] improve report pdf --- netforce_clinic/models/report_cycle_item.py | 21 ++++++++++++------ .../models/report_hd_case_summary.py | 5 ++++- .../reports/report_cycle_item.xlsx | Bin 7613 -> 5745 bytes .../reports/report_hd_case_summary.xlsx | Bin 5995 -> 6452 bytes .../templates/report_cycle_item.hbs | 9 +------- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index 0566d07..a2793f3 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -24,9 +24,10 @@ class ReportCycleItem(Model): def default_get(self,field_names=None,context={},**kw): defaults=context.get("defaults",{}) date=defaults.get('date',time.strftime("%Y-%m-%d")) - year,month=time.strftime("%Y-%m").split("-") - date_from=defaults.get('date_from','%s-%s-01'%(year,month)) - date_to=defaults.get('date_to','%s-%s-01'%(year,month)) + #year,month=time.strftime("%Y-%m").split("-") + datenow=time.strftime("%Y-%m-%d") + date_from=defaults.get('date_from',datenow) + date_to=defaults.get('date_to',datenow) branch_id=defaults.get('branch_id') if branch_id: branch_id=int(branch_id) @@ -63,6 +64,7 @@ class ReportCycleItem(Model): branch_id=defaults.get("branch_id") department_id=defaults.get("department_id") ptype_id=defaults.get("ptype_id") + print('date_from ', date_from) month=date_from.split("-")[1] cycle_id=None if ids: @@ -122,9 +124,14 @@ class ReportCycleItem(Model): dpt=hdcase.department_id dlz_use=hdcase.dlz_use or 0 dlz_drop=False - if dlz_use==hdcase.dlz_max: - dlz_use="%sทิ้ง"%dlz_use - dlz_drop=True + #if dlz_use==hdcase.dlz_max: + #dlz_use="%sทิ้ง"%dlz_use + #dlz_drop=True + for dlz_line in hdcase.dialyzers: + dlz=dlz_line.dialyzer_id + if dlz.state in ('drop','expire'): + dlz_use="%sทิ้ง"%dlz_use + dlz_drop=True cancel=False row_color='' if hdcase.state not in ('paid', 'waiting_payment'): @@ -146,7 +153,7 @@ class ReportCycleItem(Model): 'date': hdcase.date, 'epo': hdcase.epo, 'mdc': hdcase.mdc, - 'mdc_name': hdcase.mdc_name, + 'mdc_name': hdcase.mdc_name or hdcase.epo, 'fee': abs(hdcase.fee), 'dlz_name': hdcase.dlz_name, 'dlz_use': dlz_use, diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py index 0bc4396..33e74a0 100644 --- a/netforce_clinic/models/report_hd_case_summary.py +++ b/netforce_clinic/models/report_hd_case_summary.py @@ -4,7 +4,7 @@ import urllib.parse as urllib from datetime import datetime from calendar import monthrange from netforce.model import Model, fields, get_model -from netforce.access import get_active_company +from netforce.access import get_active_company, get_active_user from . import utils @@ -271,7 +271,10 @@ class ReportHDCaseSummary(Model): plines=medicals['plines'] prod_titles=medicals['prod_titles'] date_print=time.strftime("%m/%d/%Y %H:%M:%S") + user_id=get_active_user() + user=get_model('base.user').browse(user_id) data={ + 'user_name': user.name, 'hdcase_type': hdcase_type, 'branch_id': branch_id, 'department_id': department_id, diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 47be46a0d2cde3ce0490afb4a5dd864666c8e7c3..827ebd24bbd8b539f4215a62812a8a70abe4c013 100644 GIT binary patch delta 5084 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 literal 7613 zcmeHMbySq!)~34|8kB|sX_Sx_=}zemhoM_aIwWL3q`OPHQ%aCVNy#BZ8fkF&25;!~ zyTAL#_x*eKyVkrjYrT8Vd!BRlbDp!enj$g^009F71EG(+T?XMd!-ju1aj^osa&g{$ zRzSuSka-Bg5B#ED`*=2xNL$vnM~tV*`MpdYhM5VZa8tPZ`2=I=mlUAK$@_mF5qOfi zNMwB)l`b14<5;TC9vyo_?vs~=cfLc_Zl^oKFsh@#h;K1e`l%OuLJM&~tfAtbHB^89 z%vgBMw1B!f+;Y*!1o_tT>sds}*^=$jb&O8ahIMIB;|hG(kC71IzyAstO866AV6MMm=tSpBK-L;+6k%xEk~`Lt2bX7DRVCSHQgoUr;s!s{cn50sDxNSF z;M_Cnhc;r_ifPkR#TKBF1j)4aeYGTS813^?#M6|*S$-_rDFCg;7aCXrqo_oLela&7VYoNTe`9Z)X7XAf54Fo+}nC!omx2GkuyuC`WIZmwKE zZ+v%HWoRqAPH_{oe`n_xb_x>4WaJxr>QvC)wGTbgGdJq?rvKZ=3srULUDd)DGJ6e+1>=s1h#C z2Sf&1m0$_>FkIWS+Gof%M4)CyI+UIj8~pf1Cvdj4JC&q(!aqqUt9?^R3aGy)uFv$gJJZ$C zU}d<}=;1irB?fS*5D}gbRec%j>)Y}MZ zVgHwXqbq$L$dp+4HHw?nm?RvMJF^U}1z|1@Nb9M!?YuFto_;##{7ZT7=W5{tg9#+xO zY3apOJX3oBp+^yGb?hV+4NVrcD*lVz#t;kY+wJwH>xr+96F%j)n020`~0qR(+kPrMTjtz zlK3ODTTvdqd-NXD#p#_`#|*>;#PT0;^&LZxB^4h(o14YoUNqD-)d>MP@tX>KLnOLI z_HM)*&6;*Aeq*@PB{*B_M$sf*{Edx1od~i;D9)^{M-<*au(H@Z+6Fo9v41z&M_r&4 z-08*nZF7-VEbA6L(b-zaK3uKXl2chly4gpv`?auokfM`Hb#2Ej^VCeLS8Mq8DbCBP zCgXvs@Mqt_vn=+l0k8YG?sCgbl8u%Wo>!r0|A*Y-xy!A-X9limg5-Y7Cf$eQMMj)! zne+Q~9_dX9k5ZTyM|acAEz^LsY$1y$GrD9Br1_dQMe_HMe1)lL{K)765(JiOwH6pO zm<6-GHJEKv4$TOv9Peq}`ZnIMe5!}M7YPH7PG|*46u_*{X4YR0&bWjVd?uGPRyn09 z=u3H?v_msw`g{dx18f;Aj|TK%G^l-m5mfC3R8%(A>qzNloMGyrxTL{rn`5-A>)K&^ zBJ_q4rQkL1&5|cfm6=0Xu-YAMk7!g41#_DrEPg#^)zE-l|+CrL#Tdwg!65=(wrHLKWPaRQrQ*wK52T_>!OYuo-O+?eh%K$L`KToqSi2}@c`hhQc^QHau2kGK zBOQiy1w^b&ORWCjP?$)~ZF;yGgq@nlzwz-?y{N&M)>!k5rqN?Y?`V7h6wR|FIfy>P z*h`=2&f|^mp|!)8fzBSSVZiUj_NQ6mSiGNy`~pz#J24ru%BHA>itT%S;Phb(HR3i~ zbQLv0^j4V0HZA+XEY+87&nV=4o7orrQ~|cdqiCk?qWj5ip2<17g~|Hxv1VVTJZB}7 z--=yrldgFSGzymhX#hFiZXuBC755D}Z4%;DNN#9FMAE;Q_L?37O-g zo~g|pccC}+@pq%FHQ;NtSc<^8-CjBbSv!6iGk&szmJ~o)Yr=QUFdV-s^rLesIXG2_ zd}^1xgRB9Dp=yC=x9Jo;_b{l)E*7+D3yna5BB$q06=C1w~Z70r`uk_wOHHUVi^zXR(cG zrei|xg=Yq1Xx?lby2;_)VtRvGQDa)HB){Y-X~ZiU0cm%|Jh~=e@*^W6I-yg5Wh%l<;t6W8_`nckB_~PU0`JOs#V-0;zow{x{{R>DI*1~q35O4mEDMYo&T_f~w zD%Yb`meh(BXhkJ;_rB_llEhVh`E204AJIf6YA|c;Cap2uLqFwnvyV_(ITh$ao!Ht^qSm5Wa~ire8$575ip4tu$8d1!n)SxZmNUl=59R z+#?r#mH^CMxR)^JAyFpPs=9i$vmgSiQDps=JM@KjfWq-zQX6)%D-|aZW1K2aVEg6< zGab{0eOsKiM_eyHXimqzCf6IL;mLW`p%1`(_22-5mpBb?=*&D2lZiX0t-bN-jC46u zfB20<__5uls+bzBOWKV@&8vwWK^-Rj(p1an*$=q*59zVzGC0tAK&U(d@+_R8-|GbD zz|Rg{*qRp3^}oAQXC1WGWhpyRe^lAsB^i#IaXq^I+=w+b<0&7eu*V>5o8^S|y;D5L z{*4qpI_fCe+OdbZ2Y^E5P5*F0Qs_E>@PBZZ6LqY+Ud1s$Of%?vn(d<60L7 z+MKbdBdq|TAG-H++_>$*)Gk=ywbG<_Lcu~6x~lfkvvM6^od%Xd_j1P%$4ymd=DDa{ zm9tHzVc%t+<+e7H?lZ|GNVVGQb>95NQ#>ZA{!7|;AG$^Fd4pD2Oj}NLk&yz7ZE1wX zSO-*u)Lw6(yWD{r5NK6n5`~Ui)hr+R<_*DQ{B$3w1wov2znLgkNZl~EF2&4Q=@~gd z;Se!8WL$6Pk#I)q188KvI)XglYjNqC2zyid3Da1w8znal>aa7e<6&Mm7n(R#8*eQc zS|^2wi_Hz_Fr%9|Se!$p6x3D!6<<43xhRC(*W&Q)L#Fkx$!1kQ^$*vu`tB*KwaFFF z;DP!sq>A#;j}xQ-k%s5>@(4NoLHdolXaO?;E{hk%^M;}xS;m|XDZcaPpKHI@9LlA= z=ZtC|>p{c2t_M+}H0?ob9nmY(Xkw=xjd{G^586nwoz@8**OU@jC4%_?(8MWx9SH1I zZqZI0OKp-w_`Ft2`F+|AF?V2jl`96GhkAyeV!ls)CXXZA4j&_pmj&DCL3d>~>tM#5 z`dXjuyP<^g#6Z*LnFkp-@;K(5@9^v59OplcRU9W|j#iew7gsw=G0W{@&tEXCk^I7& zrNb#|IQV9zz>?-^8H-}r5+I3}1c7}DW5a=}kJ6KC12j_;unQ3sxaeLP9tPvLzZ*CQ zExq=*q4Cl>D0Wr#nQPljE&B1EN+XBmsom!Rf}&T{wXH%|$akb}T+F~B0Iw{}!HNB^ zNge;!q4^(mg&2*G4h!4_ZRhM5OLn4Qlm;^)Rw9&<9DM$F-=hrm%7GfRGagg#4x$=} z&I7YqqFNvKr07*}2Ds_$@<>CCm|n?qq6%-+JEtj#eOYeHQY6GoN86#%Ii|>KGwd{= z@tvJsazuq1m0K!);;Ma6O8Pj0csUQM0)2wsJ5x1iexJY%OjuH@m$F5shu%NP(8GI! zAMQw*cQ{{W6doJPh{!=u7FV&IXZViN;^@d$PGUJAEY`{-P@C7F^8<`h8W+^M@YL;3mg=IU<7 z+nyy_>F|;EN%QJ`};MU05%#rI6)U}pNErSL~GMa(wYWI zfTS?0Rh_rUP?N96I7S_TnJ{8e(I=|Q5@V3G38aBSukT^phc|DQg+_}$%=ve1Cd?=u z1!kmQadq}>`^O}`L{44zj<+39eiwjvH`VTA-W!#O2naI&u|9(PcaCxM23!3kmpy$W z$9Zmm-}1Yvn~pHG>^(s7e5F!CVF{>&|M`4ynqY6Kg>3BeoKF84XCkCEyRw(r#{kzg zpZ&pVKMR3V&H)}-F0BHkC{7PmN^RvHaByhzhToJ~|zn~{(TTx-vR^q?WdcvX%V3Gs{neX#c#l#X5GdqnD z=QZ8m0bIH;@_%5ZvxGWYA~bg{!rIz9uL9%S&qZHmW{`Tk$V?zUX;X^=j!`rqRK+Lf zlD%)eP~ds59DSegP0$UFJ1!9<`6v=K6-{pWxHaZMWP!fIGh9b%{R=b)k+}vP2H}qZ zlg9Bm?^yk4>HQob_Tti^;;qTey@Fg@8pHDQH5upMdnuJ3Wjtf`m$Dv((Bw z(+I?2VGAH+uD619;;@z>Rh?jJHpvO#OYM7qz)F!ND;c6PjZzf~;706xU&4n=z>7yH zPbAj724*z}9fI9BUS#x*N%#rPY^lgA`(8ieMUHrsZe9xkyB-Dc2X+G`_kbl z&TL}hd-Yxu7ClaDlG(fV*|GcI|KkP2akCsw_|1gQ~pb ze_Vd;tOiB(8qjG4WyIttw=$hY+^^39(KDrrmAM>1>91uAL zO?S0s)_TJ55ws12?QVie(lYBG@#of~Ghl`3Q%u0TWSZ)E%*PZhstGgVYQsuP1Xh?g$70%=iX#{-3YQ`b80;27=D zw0G6rT}S^iWK(urWjETw6qP9xZO42pdn^mQ@UgGfh`5}b>k}V&>m=qUXoESj4N9e= z7|1tuUQm24Of{ap93#%8Z3EP{!~HA=WV?|cbZbc52J;nC7;P!e&6myX7xO|5iHt0J z9@D5@@ciJ4STecGMM_r_Om%o3D$xBW+9iPJqNSsSnv0{8E0>v*(@zaOJ_17G0idq< zWznNF@bZ_H@i$WHpavU1a+k9p|Oo7dKYB2AXwunGZgox>WPHxh=UU z(0;WA3%Z}Q2Rwh22+-C2E^C9 zOER6T`T#HZ^C9)=S2|h)rw(gwIuztW`2gA(X??;5c17qRnVs(d%ef&pwk(=P@xo_x(pZVj02z~h$1b0*- zB1u}0BtAycqbCi|=Q~;C7shkhD}OE5ZAt0k3EGwLewD%NwbknR z72Z5>%D5Gzf~{q(G1^8?VcSLp29()a1^dmtVl@bqvF)JpTr(@{*G}SR+1k)D;w-;G zy@M7e(1=S7hxO(^LQ4#X*5HYwgPWCun~9dUla;H{9k?Tjs*3PVOW(l{fMR7$T0>C8 zZUcIE9%;Evsa`Rhot=3Qx3Rd#10X9c>r~ni zhw%^mVV)}%q5goxV9HQa2ZrOaA_f~TX#0SOhw5=LVH0Ua&3>y;uQImmeF?`al9W)s zlR!obf1L1#?6}DyRZOOJJ~j2Sg47+?sE{iLXSE?1G+pGU$ZBX?ju(QXZu3)QAtC_~ zes#BgZ|~f7xBk_B>vgFq{;T8f?T)+d&o85Z|J7gjg8q#2dujLX@czrB;JOeV=ijzU z{*3Z_ao}I0WWopiZ=(Dx3jZ19uiqsXj?KS`^0Tb)XO!PH?cI^-m%;FUM)_X{s6Qk8 zE|u=I?=SO&Q_tVu;~z@+Pv_sc{Z38&GIMxx!JS?IsjdEW{hj^p$p4q^lm73m;7{-0 z6a0=Le;GP_O8&W#{DUw5bpL&o-m$$N3U3D>AYj9xZ|A7LjX Ak^lez diff --git a/netforce_clinic/reports/report_hd_case_summary.xlsx b/netforce_clinic/reports/report_hd_case_summary.xlsx index 511bf475eae827339544a325e9c2f228571c0854..2882d3a1a471c6367d2941ee11eda99ccb01d136 100644 GIT binary patch delta 5493 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 DEpi9| diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs index cae8a03..3094f61 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -1,7 +1,7 @@

{{company_name}}

- ระหว่างวันที่ {{date_from}} ถึง {{date_to}} + รายชื่อผู้ป่วยระหว่างวันที่ {{date_from}} ถึง {{date_to}}

@@ -12,14 +12,10 @@ - - {{#each lines }} @@ -53,9 +49,6 @@ -
ชื่อ-สกุล แพทย์ สิทธ์ ยาฉีด DZ N/U พยาบาล
{{pname}} {{dname}} {{tname}} {{mdc_name}} {{dlz_name}} {{dlz_use}}