From d35fa2e11d2f386397fc8dc46bc8f1403dc500fb Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 18 Mar 2015 23:30:26 +0700
Subject: [PATCH] report claim/no claim

---
 .../clinic_report_account_hd_case_summary.xml |   2 +-
 .../layouts/clinic_account_menu.xml           |   2 +-
 netforce_clinic/models/hd_case.py             |  10 ++
 .../models/report_account_hd_case_summary.py  |  55 ++++++-
 .../report_account_hd_case_summary.xlsx       | Bin 5305 -> 4965 bytes
 .../report_account_hd_case_summary.hbs        | 150 ++++++++++++------
 6 files changed, 168 insertions(+), 51 deletions(-)

diff --git a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
index c1e7d3a..e220d99 100644
--- a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
+++ b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">HD Case Report Summary</field>
+    <field name="string">Report Claim/No Claim</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.account.hd.case.summary</field>
     <field name="report_template">report_account_hd_case_summary</field>                                                      
diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml
index 5f789c0..92d7df7 100644
--- a/netforce_clinic/layouts/clinic_account_menu.xml
+++ b/netforce_clinic/layouts/clinic_account_menu.xml
@@ -7,7 +7,7 @@
             <item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
             <divider/>
             <header string="REPORTS"/>
-            <item string="HD Case Summary" action="clinic_report_account_hd_case_summary"/>
+            <item string="Report Claim/No Claim" action="clinic_report_account_hd_case_summary"/>
             <item string="Labor Cost Summary" action="clinic_report_labor_cost_summary"/>
             <item string="Labor Cost Detail" action="clinic_report_labor_cost_detail"/>
             <item string="Labor Cost Sub Detail" action="clinic_report_labor_cost_sub_detail"/>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index ea0977e..e5508b9 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -92,6 +92,8 @@ class HDCase(Model):
             dlz_name=','.join([dlz for dlz in dlz_name])
             names=[]
             fee=0
+            lab=0
+            misc=0
             #sign=1
             #if obj.state=='waiting_payment':
                 #sign=-1
@@ -112,9 +114,15 @@ class HDCase(Model):
                         names.append(name)
                     elif categ.code=='FEE':
                         fee+=amt*sign
+                    elif categ.code=="LAB":
+                        lab+=amt
+                    else:
+                        misc+=amt
             res[obj.id]={
                 'epo': ','.join([n for n in names]),
                 'fee': fee,
+                'lab': lab,
+                'misc': misc,
                 'dlz_id': dlz_id,
                 'dlz_name': dlz_name,
                 'dlz_use': dlz_use,
@@ -127,6 +135,8 @@ class HDCase(Model):
         "number": fields.Char("Number",required=True,search=True),
         "epo": fields.Char("EPO",function="_get_expense",function_multi=True),
         "fee": fields.Float("Fee",function="_get_expense",function_multi=True),
+        "lab": fields.Float("Fee",function="_get_expense",function_multi=True),
+        "misc": fields.Float("Fee",function="_get_expense",function_multi=True),
         "dlz_name": fields.Float("DZ",function="_get_expense",function_multi=True),
         "dlz_use": fields.Float("DZ Use",function="_get_expense",function_multi=True),
         "dlz_max": fields.Float("DZ Max",function="_get_expense",function_multi=True),
diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py
index 46cd7ed..c613528 100644
--- a/netforce_clinic/models/report_account_hd_case_summary.py
+++ b/netforce_clinic/models/report_account_hd_case_summary.py
@@ -17,7 +17,7 @@ class ReportAccountHDCaseSummary(Model):
         'branch_id': fields.Many2One("clinic.branch","Branch"),
         'department_id': fields.Many2One("clinic.department","Departments"),
         'ptype_id': fields.Many2One("clinic.patient.type","Patient Type"),
-        'reimbursable': fields.Selection([['yes','Yes'],['no','No']],'Reimbursable'),
+        'reimbursable': fields.Selection([['yes','Yes'],['no','No']],'Claim'),
     }
 
     def default_get(self,field_names=None,context={},**kw):
@@ -27,6 +27,10 @@ class ReportAccountHDCaseSummary(Model):
         weekday, total_day=monthrange(int(year), int(month))
         date_from=defaults.get('date_from','%s-%s-01'%(year,month))
         date_to=defaults.get('date_to',"%s-%s-%s"%(year,month,total_day))
+        #XXX
+        date_from=defaults.get('date',date)
+        date_to=defaults.get('date',date)
+
         branch_id=defaults.get('branch_id',None)
         print('defaults ', defaults)
         if branch_id:
@@ -40,6 +44,7 @@ class ReportAccountHDCaseSummary(Model):
             'date_to': date_to,
             'branch_id': branch_id,
             'department_id': department_id,
+            'reimbursable': 'yes',
         }
         return res
     
@@ -81,6 +86,7 @@ class ReportAccountHDCaseSummary(Model):
             dom.append(['state','in',['completed','waiting_payment','paid']])
         print('dom ', dom)    
         lines=[]
+        cycles={}
         for hdcase in get_model("clinic.hd.case").search_browse(dom):
             items={}
             mdc_name=(hdcase.epo or "").split("-")
@@ -99,28 +105,43 @@ class ReportAccountHDCaseSummary(Model):
             for pm in hdcase.payments:
                 pm_number+=pm.number or ""
             inv_number=""
+            inv_ref=""
             for inv in hdcase.invoices:
                 inv_number+=inv.number or ""
-
+                inv_ref+=inv.ref or ""
             patient=hdcase.patient_id
             ptype=hdcase.patient_type_id
             cycle=hdcase.cycle_id
             cycle_item=hdcase.cycle_item_id
+            if cycle.id not in cycles.keys():
+                cycles[cycle.id]=[]
+                for line in cycle_item.lines:
+                    nurse=line.nurse_id
+                    cycles[cycle.id].append(nurse.name)
             vals={
                 'hdcase_id': hdcase.id,
                 'number': hdcase.number or "",
                 'date':  hdcase.date,
                 'hct': hdcase.hct or 0,
+                'epo_name': hdcase.epo or 0,
                 'ptype': ptype.name or "",
                 'ptype_color': ptype.color or "default",
                 'dname': hdcase.doctor_id.name or "",
                 'cycle': cycle.name or "",
+                'cid': cycle.id,
                 'pname': patient.name,
+                'hn': patient.hn_no,
+                'idcard': patient.card_no or "",
                 'cseq': cycle.sequence or 0,
                 'cycle_item_id': cycle_item.id,
-                'pm_number': pm_number,
-                'inv_number': inv_number,
+                'pm_number': pm_number and pm_number or "-",
+                'inv_number': inv_number and inv_number or "-",
                 'mdc_name': mdc_name,
+                'dlz_name': hdcase.dlz_name,
+                'dlz_id': hdcase.dlz_id.id,
+                'lab': hdcase.lab,
+                'misc': hdcase.misc,
+                'inv_ref': inv_ref and inv_ref or "-",
             }
             for code, item in items.items():
                 vals.update({
@@ -135,9 +156,13 @@ class ReportAccountHDCaseSummary(Model):
         total_fee=0
         total_srv=0
         total_epo=0
+        total_lab=0
+        total_misc=0
         slines=[]
         no=1
         ptypes={}
+        index=0
+        old=[]
         for line in sorted(lines, key=lambda x: (x['date'],x['cseq'])):
             ptype=line['ptype'] or ""
             if ptype not in ptypes.keys():
@@ -149,7 +174,20 @@ class ReportAccountHDCaseSummary(Model):
             total_fee+=line.get('fee',0)
             total_srv+=line.get('srv',0)
             total_epo+=line.get('epo',0)
+            total_lab+=line.get('lab',0)
+            total_misc+=line.get('misc',0)
             line['no']=no
+
+            cid=line['cid']
+            if not cid in old:
+                old.append(cid)
+                index=0
+            else:
+                index+=1
+            cres=cycles[cid]
+            line['nurse']=''
+            if index < len(cres):
+                line['nurse']=cres[index]
             slines.append(line)
             no+=1
         types=[]
@@ -174,10 +212,19 @@ class ReportAccountHDCaseSummary(Model):
             'total_fee': total_fee,
             'total_srv': total_srv,
             'total_epo': total_epo,
+            'total_lab': total_lab,
+            'total_misc': total_misc,
             'total_qty': total_qty,
             'types': types,
             'reimbursable': reimbursable,
         }
+        if not reimbursable:
+            data['title']=''
+        elif reimbursable=='yes':
+            data['title']='Report - Claim'
+        else:
+            data['title']='Report - No Claim'
+        print('>>', data['reimbursable'])
         return data
 
     def onchange_date(self,context={}):
diff --git a/netforce_clinic/reports/report_account_hd_case_summary.xlsx b/netforce_clinic/reports/report_account_hd_case_summary.xlsx
index 5e34291a62e626bf70a39a0ca02ebc35d383108c..4080997bd9b109de2f5ac5615faceb5865dfc131 100644
GIT binary patch
delta 3957
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
F{{VnF1`hxL

delta 4360
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
QJra~8IXjjG*{|LI1Mw%Kz5oCK

diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs
index 94d590f..f3f8b21 100644
--- a/netforce_clinic/templates/report_account_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs
@@ -1,6 +1,6 @@
 <center>
     <h2>
-        HD Case Summary
+        {{title}}
     </h2>
     <h3>
         {{company_name}}<br/>
@@ -12,7 +12,11 @@
 <table class="table">
     <thead class="scroll-header">
         <tr>
-            <th colspan="13" style="text-align:center">
+            {{#ifeq reimbursable "no"}}
+                <th colspan="16" style="text-align:center">
+            {{else}}
+                <th colspan="14" style="text-align:center">
+            {{/ifeq}}
                 {{#each types}}
                     <span class="label label-{{color}}">{{name}}: {{qty}}</span>
                 {{/each}}
@@ -20,64 +24,120 @@
             </th>
         </tr>
         <tr>
-            <th>#</th>
-            <th>วันที่</th>
-            <th>รอบ</th>
-            <th>HD Case</th>
-            <th>ชื่อ-นามสกุล</th>
-            <th>สิทธิ์</th>
-            <th>ค่าฟอก</th>
-            <th>ค่ายา</th>
-            <th>ค่าฉีดยา</th>
-            <th>HCT</th>
-            <th>ยา</th>
             {{#ifeq reimbursable "no"}}
-                <th>Rc.</th>
-                <th>Inv.</th>
+                <th>Date</th>
+                <th>Cycle#</th>
+                <th>HD Case#</th>
+                <th>Name</th>
+                <th>HN</th>
+                <th>ID Card</th>
+                <th>สิทธิ์</th>
+                <th>Receipt#</th>
+                <th>Invoice#</th>
+                <th>EPO</th>
+                <th>ค่าฟอก</th>
+                <th>ค่ายา</th>
+                <th>Lab</th>
+                <th>Misc.</th>
+                <th>Dlz</th>
+                <th>Ref.Inv#</th>
+            {{else}}
+                <th>Date</th>
+                <th>Cycle#</th>
+                <th>HD Case#</th>
+                <th>Name</th>
+                <th>HN</th>
+                <th>ID Card</th>
+                <th>สิทธิ์</th>
+                <th>HCT%</th>
+                <th>EPO</th>
+                <th>ค่าฟอก</th>
+                <th>ค่ายา</th>
+                <th>ค่าบริการฉีดยา</th>
+                <th>แพทย์</th>
+                <th>พยาบาล</th>
             {{/ifeq}}
-            <th>แพทย์</th>
-            <th>พยาบาล</th>
         </tr>
     </thead>
     <tbody>
         {{#each lines}}
             <tr> 
-                <td>{{no}}</td>
-                <td style="width:8%">{{date}}</td>
-                <td style="width:6%">{{cycle}}</td>
-                <td style="width:9%">
-                    {{view "link" string=number action="clinic_hd_case" action_options="mode=form" active_id=hdcase_id}}
-                </td>
-                <td style="width:20%">{{pname}}</td>
-                <td>{{ptype}}</td>
-                <td>{{currency fee zero=""}}</td>
-                <td>{{currency epo zero=""}}</td>
-                <td>{{currency srv zero=""}}</td>
-                <td>{{hct}}</td>
-                <td>{{mdc_name}}</td>
                 {{#ifeq ../reimbursable "no"}}
+                    <td style="width:10%">{{date}}</td>
+                    <td style="width:6%">{{cycle}}</td>
+                    <td style="width:9%">
+                        {{view "link" string=number action="clinic_hd_case" action_options="mode=form" active_id=hdcase_id}}
+                    </td>
+                    <td style="width:20%">{{pname}}</td>
+                    <td style="width:20%">{{hn}}</td>
+                    <td style="width:20%">{{idcard}}</td>
+                    <td>{{ptype}}</td>
                     <td>{{pm_number}}</td>
                     <td>{{inv_number}}</td>
+                    <td>{{epo_name}}</td>
+                    <td>{{currency fee zero=""}}</td>
+                    <td>{{currency epo zero=""}}</td>
+                    <td>{{currency lab zero=""}}</td>
+                    <td>{{currency misc zero=""}}</td>
+                    <td>{{dlz_name}}</td>
+                    <td>{{inv_ref}}</td>
+                {{else}}
+                    <td style="width:10%">{{date}}</td>
+                    <td style="width:6%">{{cycle}}</td>
+                    <td style="width:9%">
+                        {{view "link" string=number action="clinic_hd_case" action_options="mode=form" active_id=hdcase_id}}
+                    </td>
+                    <td style="width:20%">{{pname}}</td>
+                    <td style="width:20%">{{hn}}</td>
+                    <td style="width:20%">{{idcard}}</td>
+                    <td>{{ptype}}</td>
+                    <td>{{hct}}</td>
+                    <td>{{epo_name}}</td>
+                    <td>{{currency fee zero=""}}</td>
+                    <td>{{currency epo zero=""}}</td>
+                    <td>{{currency srv zero=""}}</td>
+                    <td>{{dname}}</td>
+                    <td>
+                        {{view "link" string="View" action="clinic_cycle_item" action_options="mode=form" active_id=cycle_item_id}}
+                    </td>
                 {{/ifeq}}
-                <td>{{dname}}</td>
-                <td>
-                    {{view "link" string="View" action="clinic_cycle_item" action_options="mode=form" active_id=cycle_item_id}}
-                </td>
             </tr>
         {{/each}}
     </tbody>
     <tfoot>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th>{{currency total_fee zero=""}}</th>
-        <th>{{currency total_epo zero=""}}</th>
-        <th>{{currency total_srv zero=""}}</th>
-        <th></th>
-        <th></th>
+        {{#ifeq reimbursable "no"}}
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th>{{currency total_fee zero=""}}</th>
+            <th>{{currency total_epo zero=""}}</th>
+            <th>{{currency total_lab zero=""}}</th>
+            <th>{{currency total_misc zero=""}}</th>
+            <th></th>
+            <th></th>
+        {{else}}
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th>{{currency total_fee zero=""}}</th>
+            <th>{{currency total_epo zero=""}}</th>
+            <th>{{currency total_srv zero=""}}</th>
+            <th></th>
+            <th></th>
+        {{/ifeq}}
     </tfoot>
 </table>