From 6e547eae65a676d93dfc6e11922aca8de5473be1 Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Thu, 15 Jan 2015 23:26:44 +0700
Subject: [PATCH] report report

---
 netforce_clinic/models/report_visit.py     |   3 ++-
 netforce_clinic/reports/report_visit.xlsx  | Bin 5206 -> 5230 bytes
 netforce_clinic/templates/report_visit.hbs |   2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/netforce_clinic/models/report_visit.py b/netforce_clinic/models/report_visit.py
index 9ee2155..868cd25 100644
--- a/netforce_clinic/models/report_visit.py
+++ b/netforce_clinic/models/report_visit.py
@@ -69,13 +69,14 @@ class ReportVisit(Model):
         records=get_model('clinic.visit').search_browse(dom)
         lines=[]
         no=1
-        for record in records:
+        for record in sorted(records,key=lambda x: (x.patient_id.id,x.visit_date)):
             lines.append({
                'no': no,
                'vid': record.id,
                'cid': record.cycle_id.id,
                'cname': record.cycle_id.name or "",
                'pid': record.patient_id.id or '',
+               'hn': record.patient_id.hn_no or '',
                'pname': record.patient_id.name or '',
                'tname': record.patient_id.type_id.name or '',
                'tid': record.patient_id.type_id.id or '',
diff --git a/netforce_clinic/reports/report_visit.xlsx b/netforce_clinic/reports/report_visit.xlsx
index 879078ac38b1779e26966bc64e306efcab30328b..a18be86f7658b08aa540c5c6eb08747fe28f783a 100644
GIT binary patch
delta 2012
zcmZWqc{J3E7yr(Thru*8Gc=YN$u^6nNOme~#umzwWM^XR)fis$W-1ZcCLzvLlfn;W
z$tZ?A+tfq0iI5(ZX{vc1Aw~G{&hPwAzw^6)+<WfloX_X}aqqdGQQRC()|~{AKmpRy
z(g3$k77YS%8#F+QTZLr>)}{BxOq!sk2E3*Hl8i!Hbxj*jg^Eq^xmt(wT^Zv;3SqnQ
zYzxZ%(mHKjSQc=jF}<Y-ovslOfMu@@z6)KQ^=2!k^qJi0?n|=glBa`hLOh})gexCj
zp3Wo3F|MM+9<>`T$|o-N{>b^rsNc;F){z5n-};;{<MeehV?9dMt>_$0y+ExyIu78p
z=%|JKAXJrIa`+RjB{#uV##7zDb|r97Lrs}iR&pv^_ReASi(FvULQ~WDgJ)wW#1N4W
z?Q0uCM{48Vp@mM5y4`$I^<VO+_u+vR<u%_0|56wz-_O8=o{&pp6(@i6e{DN#WBS8p
zo^k%cHCR7xO=+O7jvlMD-*r$AIhNHWOTJai{HvC{uiho7_he~0jdZbmsg?<xSA6SW
z|77(Bs%Wh0-ogcKgIdd0Vbo1bzr`>_d=>&t^E;=#(VcZrk}>LL(y7dN*JDdM8p&vI
zwkIp4q(_7+7<?=yt2pi&>4e+`pQyxEn*1T@<GH%Gvyfr)j?O!F)0*Ng2|X*G`{v46
zt}$3{5*5sO$t>%<_gY{jJH$<dxI{xKud=JwoixnrWdP24C805E;)v7qoRL6|a4)Am
zT#@j^*-qZm=`FfRO(@!3%QVCbiZi_xOLQ9$nW*SDxb)P4g(JrE+FYXX1?zfmwHBLa
z8@MI2r;E9CzI?s)B@676AkwPEbS-#?)Nht_)cBjOv&{Gd=Q^h?-XFcJ0^8H_)iGq1
zVVM!VX%WhQK#YV3wcO1huniR_a|;dYO6JgK;M0_rfN9rMK9qlfs>MAS0ymPL=h9oU
zT&HMX-lCM6Cw6cuI2Xdb&AG|~k<EH}h2N^4*9v_W0X=ZbfQEh**zk@iBrbz1RDCAS
zU7YQF#9dB*2IXT8>mOTh=XIx);uW0#eEvoH*z=h%%Y%UhsdVv&uYw6u{=5|Ljl<lt
zZ`gA$_L(=$%n|}(t`v^Udtm8f*b`wsOR(PTnN4_i)R6@g>>={%q-^)+E5pV*tvPbt
z#sl>6Wu86Efi>d-k+1tRv<}<kyF~L9U=Q;<t-tz|(j@rU-jP#1e5`jldZv#5NuX}_
z^|94*kxI(zQkscs^6BgngDm;|Eu_Bhhk}D_bSyMSpY}`o(<~pM<31V<CA8lgv-5`N
zwI1|?JziQB(YAU=V~8FLUTrV%Qa4kh3%{<7ec}Nmdztvt1htT|c??{p`nbg83D}bE
zo(QG;*Yk}1q_689!UT<GC}^<vl#D=0QJmOx3N*SDPYKTHkhYqB6iB`@f3HR(csi{g
z&hhsInJV8rTA)G(A!H0Vn3LDAlLb9yHYJ6<dpGhBj7eJi*alPRA&$p8$<WDnHGf~d
zhA|Wjc|e2w9goL1^^W;G{aEm<>a%YS-RoAzRF*CY9E-!dw@XZ_)tqzsL&C<^v9Ydu
z#km`DwSwvz9}o8}Kx&4&y@!2v%ghEQ;(4DEhYOg+QoeD0H~e(Iu$+u8?Qt>7BNkYx
zYaIn^>RjrG88s5FnY2wb!NSaM4V#R1#BD%lXFpsvyRiD??%PGf3jdhb4Cb$8ri6{u
zu9NN@XE%a1|9E+C<;xC7TNmNV&M+&vv+K75iPe=auOZX=trdlvAa|0Kw4HGNL8k-&
zRO|$RpWYtJREj{4LhVPltr3sVxZ_h79gB-SWV%_@!9=JbIU?{&xO08xXZJxCk?Qq>
zz?{4oxJy9j|5371UKC1fHg720m(14wo4?q`5?kjP6+<b6U+|c}vvIp}t2oS&>sB;s
z(wd%TPXdlwbEqsyPi|@;MzhB!zY72Ax@*sM=Q}hDdHR)2Kvluni4;|0+2b4_^SuAT
z840S;mi)Zt=_k){C0%NelUjB4c<6!VPK}4Zg=bXOcZG}I++NF=+soD;Y;{<HOntsI
zt`l^)VYrdf*$AYR6363;R3U|L#aX%BQx2o5XEqO_S|XI#Ya6LX_M+n3Rtx;1W%K4=
znu%iecY3wx!O*XZcDcvV7<G}<jEP6!^Q<wv<)HjSd~ZJQ{Y1KQl1eU8uZq?N)&lKw
zi+y$MaUJ>$$&Nz&^=iUPfq&e3lVYo|>&1N|QJd`mFEMs#y(ebK+rNuz6^&S#Te<f^
zWF`)fq&M4TwTd&_IBW7Ft+J|9Rcua5_ME5JDV-~k=QHLKRlXaT(G^$Pm&@DKsR8-T
z;GlyM%8~9ik-t-7kzh8w#&M4m`bY^Sq2(HmyX$ruG5AjFCRDh|6T`PRZ2uka(g6a1
zCdmJ6xWN!A*mgE)SuA9$Xz%#P=MKSrx51k`6SwVd2f}14J0KijT&BMLe@}%~f-qIx
zMt+t?0Y8TYYZ0No#odj>oIC^t0BW@U`PhW0;MmwGJt`&Iodg1-fd5$Rme6v7sQ*0}
z0JIeV0QR#EATRq5IWZ|YIxO-3sH_|$26TW`gH+v`)sMu0UEr)^a3pIJDYpg4p)jCw
N76GLtsfgGX{Wm$Bhv@(S

delta 1987
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

diff --git a/netforce_clinic/templates/report_visit.hbs b/netforce_clinic/templates/report_visit.hbs
index 0063263..e70c58e 100644
--- a/netforce_clinic/templates/report_visit.hbs
+++ b/netforce_clinic/templates/report_visit.hbs
@@ -18,6 +18,7 @@
         <th>#</th>
         <th>วันที่</th>
         <th>รอบ</th>
+        <th>HN</th>
         <th>ผู้ป่วย</th>
         <th>สิทธ์</th>
         <th>แพทย์</th>
@@ -29,6 +30,7 @@
                     <td>{{no}}</td>
                     <td><a href="/ui#name=clinic_visit&active_id={{vid}}&mode=form">{{date}}</a></td>
                     <td><a href="/ui#name=clinic_cycle&active_id={{cid}}&mode=form">{{cname}}</a></td>
+                    <td>{{hn}}</td>
                     <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
                     <td><a href="/ui#name=clinic_patient&active_id={{tid}}&mode=form">{{tname}}</a></td>
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>