From c63f63db76d001994092c9bf9fbe3185dd3f2c92 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Wed, 6 May 2015 12:04:00 +0700 Subject: [PATCH] improve --- .../models/report_hd_case_summary.py | 1 + .../reports/report_cycle_item.xlsx | Bin 5590 -> 5563 bytes .../templates/report_cycle_item.hbs | 18 +++++++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py index 2cece3b..df74939 100644 --- a/netforce_clinic/models/report_hd_case_summary.py +++ b/netforce_clinic/models/report_hd_case_summary.py @@ -145,6 +145,7 @@ class ReportHDCaseSummary(Model): dom.append(['branch_id','=',branch_id]) if department_id: dom.append(['department_id','=',department_id]) + print("dom ==> ", dom) npatient=len(get_model("clinic.patient").search(dom)) dom=replace_quote('%s'%dom) items['topic%s'%count]={ diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 3abafdcb554928abb95c26dfe8a8303bc20b6246..8002e43210b39a039c10db4cc86db90414c7a792 100644 GIT binary patch delta 3121 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 HXCM6+DpRUa delta 3190 zcmZuz2{aU38y?0oma*?d(KHzQ9+Hq{>`R2g*oCo-eH-(cB$Q=R6jI4ZMfQCgOMC{| zvsXm2FENJrssDWE>p%ZJ=Xu`uzUMyY+Q(9G|S=3H21St@Mh8bKCfb7S_%r`xansh={OSEJUt9vM5 z=PFsLuoonHmqI|*x$1Q&W=bg;nvo^pJ?d2EXue_<7^up4VMRN&rFzAYzFBfJcKm>{*V z#gKNzAZOm8MF(C+)>T^S)rx}fHKQinKl-tj?$ z)s|7Pbn@bM%ygun*uF_OTBr^=S#Uj7<+bh7R@Ccx)73e1x`n~R^{(c(C6p;y#?i0l zrHA@BNsY&RnIL8(>{H1=Jcb>$^6I<8xPu*ex@G;~cG9!{efJ}>?eWU4G1d;{YH4ar zxD%bU)hm9u@oI#BqU@5%L#6i%Uctjv)pREAd0k?kLx%bK(}ILjSv_iv*zxF1;Wvo#Ex*-Dpq%cqzJ z<~R|e==e;)noG>Q)q@MWkh*DzuB&*RE}Z%IlPzM%8E6G6fuY2JDZ}Kgzhs+s%o5RocRXGjGOXD536Tpn<5CZi zO!7!U|LmC`dg1k|;yz92_!L*kpSRqvGF@WXy2eQ7phso8ruET5E6wj7{ZMRFP~0s= zkK!Sr!ga+WKRFBMvZVaHwPwE;A!4XR=#@F@&?9;}$6AH4#NORpE@j@$X`8KUq}0|j zHWTHw6931~Z+<|LqJ8QPFLOa4-xtkE=R=Y$tJvzRr$j-qbE-}3=s2@)Kcn4C5W7J{ z%vWekwvIt+?8l`0F1!5hj_(=YoCRT)$>~S>y;s@<)aw`CA(#}2NGEE8bIHJ^r2V$*Wbbz(Lp8?eB_i^r6D# zM)dBgJNBK6!?8l_<3{yvN9B~jbhpSWUd)SYo)*EwpLTbOTJtsbN(N}$Ec%?3qj1jM zIVPpJdwYx}Qv3MgoxOkK)*R~$!R&!}JZ>S01 z8h`2asIk2L)E$)cW4P?>&_$(cOj}FSF3>EEF zJKL*Ps^BNud--hdqYs#t7frGXaeAN?>uEYGi-1w5T|uO_;!VX&ePbK&Ld&8gDCP`) zaSuT{`yE1Car@XXkAMkpB4bM006!RqoNoMx8gydf9A-zS`1G&0Z9MZeGY?r`4l@X7 zMZ(7|m8?OD?xf<#`l(>#NSazjlGrm6tr!o{z0fIPmki?9;mu`+uGC%nNihgnVDKnw zUcPQFKy5q}8rrQdR{sOTAB>)=rX|#v*JWk+h_8dVuRX(?$s zHx6fazGeDp`eW8hCHCcNPle=Ej#VWGrD4Rng2pt9kKWjR^M}3qQZZ)=b)@Sx)3+=* zi*=V8+8Z=F1SdCEbQkj5^<#p+D2?bkzz>o+q|sdJSZds%n!)OZ@nZ*{kh|)Zk1t#u@r7-4xYXHQOSh~uEh4JWT66FKc2@+TgRw|BPiL%YHoYOGOssr=-`1xTW72k2G2_3X~geexu{!}?+K=o){ z7Rz=$YGn|SZDWW}$zh?nC>t*>i(wQW8oI``Y}yjo@m4>l?GJLBUECMo&%XRb z1aOqQ8D~c9x*sEd=-BDYDx1_u6e;90^eqU#u;=v4 zP*9NTKv;DlG)Fnj#W^D>Dsoyba$2vG)Pnny`*^NJIeZ^H+ zN;O_CNBn{yK9Er446<|>*Sw*dqTukv$d=LATd~otj1w(}X2&~Bs$^(X1Ft<=PP3Da zOK~Zf%^F7({FwPp402bM&&ldD;+Kz`(CXL$cS&|hh4<QblfQrB|NJ;{ zCGrE$?8j=fwgbbIPiqb0Iq@n37+4!*_qN2Bm_d{)E7*w#6E|~tc6yF)KGOvcdomAe ziHSeIc2(6YmF57)*JQ$9fvX-uzDjiJgnh6DDolYV4u_or8+$ELq+jOes-|-K@QL{; z;rjpo|Fj9p*Q{kdH6wjVk z{@rLizkBPyOi7CyfPdV-Zh_6Y z!7K^@fOzs4=0BuLEWf0oeu3W3etzEnPwdRm#w(z3qPC#|0NDRfGqT}QIUzKdU)BEr D`5mUP diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs index c8fffd2..fd6eb88 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -12,8 +12,10 @@ ชื่อ-สกุล แพทย์ สิทธ์ + + ยาฉีด DZ N/U พยาบาล @@ -36,8 +38,10 @@ {{pname}} {{dname}} {{tname}} + + {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -52,8 +56,10 @@ {{pname}} {{dname}} {{tname}} + + {{mdc_name}} {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -62,14 +68,16 @@ {{/each}} - รวมทั้งหมด + รวมผู้ป่วยทั้งหมด {{total_pt}} + +