From fd1048903c541928e93c45938daece14f190a540 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 3 Feb 2015 12:09:30 +0700
Subject: [PATCH] report staff

---
 netforce_clinic/models/labor_cost_entry.py |   3 ++-
 netforce_clinic/models/report_staff.py     |  27 +++++++++++++++++----
 netforce_clinic/reports/report_staff.xlsx  | Bin 6690 -> 6956 bytes
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/netforce_clinic/models/labor_cost_entry.py b/netforce_clinic/models/labor_cost_entry.py
index 5ac11c5..f8fb063 100644
--- a/netforce_clinic/models/labor_cost_entry.py
+++ b/netforce_clinic/models/labor_cost_entry.py
@@ -142,6 +142,7 @@ class LaborCostEntry(Model):
                     for hd_case in item.hd_cases:
                         #hids.update({hd_case.id})
                         pids.update({hd_case.patient_id.id})
+                        #print('pids ', pids)
                 else:
                     for hd_case in item.hd_cases:
                         doctor_id=hd_case.doctor_id.id
@@ -156,6 +157,7 @@ class LaborCostEntry(Model):
                 }))
 
             plines=[]
+            print('pids ', list(pids))
             for pid in list(pids):
                 plines.append(('create',{
                     'patient_id': pid,
@@ -183,7 +185,6 @@ class LaborCostEntry(Model):
 
         for line in obj.lines:
             line.delete()
-        print('lines ', lines)
         obj.write({
             'lines': lines,
         })
diff --git a/netforce_clinic/models/report_staff.py b/netforce_clinic/models/report_staff.py
index 3641dae..b9a7e9a 100644
--- a/netforce_clinic/models/report_staff.py
+++ b/netforce_clinic/models/report_staff.py
@@ -7,9 +7,10 @@ class ReportStaff(Model):
     def _get_store(self,ids,context={}):
         res={}
         for obj in self.browse(ids):
-            total=len(obj.lines)
+            htotal=len(obj.lines)
+            ptotal=len(obj.patients)
             res[obj.id]={
-                'name': total,
+                'name': htotal or ptotal,
             }
         return res
 
@@ -50,20 +51,36 @@ class ReportStaff(Model):
         refer_id=int(context.get("refer_id","0")) 
         obj=get_model('clinic.report.staff').browse(refer_id)
         lines=[]
-        count=0
+        count=1
         for line in obj.lines:
             patient=line.patient_id 
             hd_case=line.hd_case_id
+            amount=line.amount or 0
             lines.append({
                 'no': count,
+                'date': line.date,
+                'hd_case_name': hd_case.number,
+                'patient_name': patient.name or '',
+                'amount': amount
+            })
+            count+=1
+        count=1
+        patients=[]
+        for pt in obj.patients:
+            patient=pt.patient_id 
+            amount=pt.amount or 0
+            patients.append({
+                'no': count,
+                'patient_name': patient.name or '',
+                'amount': amount,
             })
             count+=1
         data={
             'date_from': obj.date_from,
             'date_to': obj.date_to,
             'staff_name': obj.staff_id.name or '',
-            'staff_type': obj.staff_type or '',
-            'lines': lines,
+            'lines': lines, # is doctor
+            'patients': patients,
         }
         return data
 
diff --git a/netforce_clinic/reports/report_staff.xlsx b/netforce_clinic/reports/report_staff.xlsx
index 0b4265a88e436eb17ca919c6a810d64f79adc9a9..85089eccaade7bc8ad470e16c3362de5d2a203d7 100644
GIT binary patch
delta 4316
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
L!2A?CKNs~sXmah-

delta 4135
zcmeHK_cxsD79JUOFb0D#${aOFqW6*$F>3S{JyD{LQKAMDy+kizFbQEo5G8st1QCSj
zf+1Rz5G@idg1O|}b<WAX_lNrjoW0h!zWwfRKWo2hee2oJ-sRGdC294wfuv9XB_$=m
z!(64BmYD>2`mW(8;s5ER>z$KDYg$^s!6TZ2qDDE_jc!Kg+C8(^aeS7t7`-=MlV&{y
z1=Gk)3|G`~Z8e)LZ-tKKOox2~>GT&<F!r}XFJuyyj(Ypv^cwXCL)1Wt<ldol4_{d-
z=57s5AA;bbpqs({WsvpUi{B7rbzdl)+fs^E&F=qh+0cvkg*(U_uenR3G58+W0vZ$#
z-iycp>@{TaOhOn%P$3}{7NkP6W<5bI*~K(&U0OI`<G_Wd>xRyBi#2u>FiKnZuQ4#I
z^!Xv|rDb#f0I{riaaH5&2=Px&BP+Tym7u-Q+S_EVcOE(P+j4mE7eEuiTzP4|&I5s-
zw4TeO6_10n^rO3i-<hEsU*&JIT{=Q_1{@l)en~Da^m<RKQ{NZTj5yBy#I~QY##5lJ
zn#3{Nb_+#m_mYGb0U!uaJKH0)2jzFWH%kigaw(gZ-76D1jwf&B+iU(d-K0Te-j?3u
zQV<|0!pCw|oWp(OS+^<;tBS`ck8q7${I@28s78%%s#*`Ofuqsw(IHs_@g-dqB(D2i
zvBl*API&&|*wQ^#&5`y)dgjbDhG=HDZ3$B;g(tZ98hVO(<$9U8)^7b&WYCwxofXfZ
z0C5H7ASDd$12QRN*NXHi|5^r>aIR{P(Brr#Zt!54l;cqq!w`o`m1538(t@m_V9&yK
zm*5DYlRFO2X0D*A8;mk;2(0RWb#?WU6qLZ0?P7_<?e!w!&<aY7w4Av7G;J~(z?Y^G
z9WpjxVNWo<|8ehKH!2f!Tw5L9Xl2JiK~R5-alTf@4I!<+V<#zu^Hx^vvy$4CUYg$k
zpd;&3T^fjEViIcWA4>DM)V`<24ab@GGFyA9M3vw;%F$MzV|F||ghYi^q~tF)CI;Pm
zKupEM=vegJKD+Xb%Zr0I@y#?xT*kXh^tzYQSg5Y>o0v1i@E6S;H_hPFz8+8K55Hl@
zxl^FGtw#4Y#FZWqokj7@1;X!YgkKa?R5LHXky>AQ;`K}-L<Wl+Cn&<&J7SSyL>94g
z?ZZLXc0s@DWkRFg<Q@@z-&S9nf>N)?vxEr<07Q`k0Kd@Zlr6mJ17u|AH)h&CQ__%@
zeKXI1?x###L6fN&UW+eQ6YK-s1u(0$3|ZWr@K!)R^vAeA$rneh7+!3rd`idVsvjE-
z@NJiqP0N0~k_Ljz_FxFUqcmrks^4OH@QAbGB>Vfr;Yfi<Dlj#XDud|ped-9lSl9!o
zjUj2YIKYg(351j&$>q=nKm&lfo{)pCBzWnveiUii1VWDbqi7zfT)_u_`u?T;4v33Z
zgQsA<BiQOCoZ<WsrLAMF{)xAT#0M=A-1Uf~3k;E1h9`g!GD4fuieA+28im*W=t+)?
zpRU#g$mw0UEm|JHFdT)Z$G&=mVfAZw0#UpV+^Y|#`tJYyivSOLRvXU8H-gs8DNhKQ
zcQX&)(tOb?x+GQfLU;A)b@qy?)-?Lvc4t#tBXFq=GGWb7qIUYq60FT8V6%h7C*=3=
z>MZN7D{zGUpo0$`O+8y$Coc%-OqPHV3PC0BUJUloaBA_-SEP@z6qKxZez&OIS-Mp%
zR^6yYkX@#~2J#(!{6Lgf67+Hb1}jHNjoPLQ7+8R?EOK=RG+U&oyCq@sJ!ATO7h?%&
zCS*4@$4gCaO=&T{_>o}!+NP;&m5nD#+`-tyQBpJilDNPugk?ss!5{bNx^KZe-w>gl
ztB-t$z?;{v_S#uCv5S9uUp=X;dpoY%OE$aj<Gidg3^9bh^ED#15K`SZ_nNV-(Am@U
z8YecYdZ~BY4)cOH=i(<rcHN?>2U_=!dRj7e`MvAuZb}Cr*V@FBE^xx*+L0gKCV(~h
zMGIqA)oK#>k}l2)@vWUu*8YfQ67#-*t=qDTlsj3E6Yn}t2TWXr?GAQU#`;ZMQ&3ca
z?GJ)&={HKyF@DAcw630oW~4HkVK6QOxpf1%6V_Uh1R}|15s7@YXghe&0Jt;0kR#pr
zM7^<7>D+X}5b-)Z)K-rhE2ZJ2t|6dA9?@T1lajIKd&@B{YyN3MP^r?a{{~^EAz#)d
z1*G|iY&`Or{@T5D<NM({BOBE`o}f=WsS5FN7!x-1{7w1XB;oHv;O&Xpa1^^<E*EnX
zJ)4}u(%bSzXJFAe#8m|_o39D;OmynT0-0WmgYmT~I>i@e+%m&DtZ{9LI#B3`2IbVE
z!URL1Olh|HC+}qD`YDA8pF_tMMBZb@9M_-cAK0)ph4Eik&+`+E98J?l7QF_K4Ua_}
zMqhD2w~lw0dO_h^s}haZp7J<pk(q^DuP|C^lA@&uTrGMe|JfKw>Ef+wV}6K_d?Hw%
z;s$$ZKAt_U`SnxFbX9MY27|!22Ph32yftAhw-Psq;?l1X+9Kaw!FE#-kHLN=!Z@GF
zKm&Ia%eQ=5dv1BrD=b4_<_VuHVfFD+bT52)KURJ3tvX^kYZlN7-xT6$v+$$&U(KQy
z1pP-||B=^!<n{lOS0I=VjZC?!4HSb!ZJoqJ2Bga<g!we-v?|Gv0}OsnFT?uY<zSfj
zc3$Oj$B%Np+V8s?Q@xffS?b@-PK9l;mb4(LA4Mq2HqRnGIBV^wCZbXyc_*Y}ZfHjg
zqE50<wt3XG^FaFbg2=dmLor3Fiz7_~u&9+f2T-;uSPW<S*7gOR@!K6mfCgKi^~i@@
zD7Pz0E=c%<mA~h)4ew5~)W>IXOS2y7g3pWvtswy$!tBYP1QZUpRan;dT<$*1^rkJ~
z7(GvafW|@bqQ>!ZnI|A4uEkfULj(mSHN$-O2mk=EA^DF!p>`Vl)97j(=_W~dPDk`#
z!nCIe0q!C`cLLoVeJ%$e-8XKe+tKr*kNdsSo*0doPV)C;6wBIfw)_a*ldC`ehUgrU
zFv-yrYdbFFR5Okgx8ugl#SnHD1l1-X^z@g>uycIx4-^mP+-eqglyRf*n~<PzBm1v<
z4~t)C+*aj!n+G~z(9Wa>Rtjz3skjhV>)X>Pv$ET1qn6zoCbCSBlwgbUzD(1NF8OWo
zsM3M7`jyqJ)vR^!>+X;rY+*|QvCXafTH&q9xEtFERls|R4p1dV<u;ahdXJFyj0?11
zscTWG*$xRJ9HLeCLNC4Ai-#wbW>&4v+(m8PbyygxOUxNDJ^6SmCd|u*?lnLG{>8_R
z#>5UJQsO@FK#u0wy|+uwpqCtDacJ(|lbfTS7dRpN2BnnzK0e%Xl!ydgL&%AFORH)!
z)i`u~?wZZjumKnMdpD|i>-2bhru<zJ-sKwvP7EeBdHjBm;vI?-Ubu_@973nTBE}uq
zpT&~L$6d%Q@^xjfw;fHJ(=+Stktr!DiNMHDAnHs22)7@$Qf+na6)akF>1ZKEEu3BD
zO=oq{f^ea1^4PeN6!M4iCf61F7BevNmeH5rVI@1_06aHjXs9nm_0p+{#4k#SmIcFg
z0xz-SE`|f7xU%LM6HO(0EIVMQf2<N$8i(vNacLAbKfe8ZJ=WJwODsb7oif>2+-k=i
zJ9#l|cEh0oIGIjMhnPP~gQnB!n@btZGqJ-j?@c3@VLuLrmXSxH-nre6n6cA6g$R7v
ziFBUGi62{xr2|sgH4>n|o2<*WCB*pV`*ZCM(y4EI#H<)3(+@Sqc43y<PANolW1<%j
zk?hk+%jkHey@`BAJLbL0I>#{S?8KT}%jdjt6(2lyS?f0I(;J6{CZ;*toRTZ*TTVJs
z9yqqm{2XBfqOlyKYk|?-v$q)Wo$QgG?Dx~ow7%x{xW+EP3<we_D<jPP6i(f%d%9ES
z0DxJh{~$z-EA-!6Y6R1bKi1V5=D<JJRg3e|XZve<`gsJ^8A*PQ>gn_6mAKAMf7jyk
ze{$-~!KN#*3jBg#I`@$(J(89GC-Cp&g#H3lN`K4B^Rwg@E9{&hIGu)#1AbQP@7F)0
z=U=7-N!Mh9q0f@GpqtcFr(bTJk{<F`#;Iq-2mm;s?Df4-o<1VCJU!1yt*=dT4hr~l
zSy!Xbh;?E=MIN0#^uM6pPcQi=+8*WY_}_3&6}5W&Y^vNT)`<)NI4$=#>taeLf$@=F
IWjTxe3odC-ssI20