xxx

netforce_clinic/models/report_account_hd_case_summary.py

@@ -92,6 +92,13 @@ class ReportAccountHDCaseSummary(Model):
                 items[code].append({
                     'amount': amt,
                 })
+            pm_number=''
+            for pm in hdcase.payments:
+                pm_number+=pm.number or ""
+            inv_number=""
+            for inv in hdcase.invoices:
+                inv_number+=inv.number or ""
+
             patient=hdcase.patient_id
             ptype=hdcase.patient_type_id
             cycle=hdcase.cycle_id
@@ -108,6 +115,8 @@ class ReportAccountHDCaseSummary(Model):
                 'pname': patient.name,
                 'cseq': cycle.sequence or 0,
                 'cycle_item_id': cycle_item.id,
+                'pm_number': pm_number,
+                'inv_number': inv_number,
             }
             for code, item in items.items():
                 vals.update({

netforce_clinic/templates/report_account_hd_case_summary.hbs

@@ -12,7 +12,7 @@
 <table class="table">
     <thead class="scroll-header">
         <tr>
-            <th colspan="11" style="text-align:center">
+            <th colspan="13" style="text-align:center">
                 {{#each types}}
                     <span class="label label-{{color}}">{{name}}: {{qty}}</span>
                 {{/each}}
@@ -29,6 +29,11 @@
             <th>ค่าฟอก</th>
             <th>ค่ายา</th>
             <th>ค่าฉีดยา</th>
+            <th>HCT</th>
+            {{#ifeq reimbursable "no"}}
+                <th>Rc.</th>
+                <th>Inv.</th>
+            {{/ifeq}}
             <th>แพทย์</th>
             <th>พยาบาล</th>
         </tr>
@@ -47,6 +52,11 @@
                 <td>{{currency fee zero=""}}</td>
                 <td>{{currency epo zero=""}}</td>
                 <td>{{currency srv zero=""}}</td>
+                <td>{{hct}}</td>
+                {{#ifeq ../reimbursable "no"}}
+                    <td>{{pm_number}}</td>
+                    <td>{{inv_number}}</td>
+                {{/ifeq}}
                 <td>{{dname}}</td>
                 <td>
                     {{view "link" string="View" action="clinic_cycle_item" action_options="mode=form" active_id=cycle_item_id}}