From fdef5622f323875ced95c940257c5d6c1726dd0c Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 30 Jul 2015 15:00:36 +0700
Subject: [PATCH] show hct on report cycle item

---
 netforce_clinic/models/report_cycle_item.py     | 2 --
 netforce_clinic/templates/report_cycle_item.hbs | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 78e5f41..b108c00 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -147,7 +147,6 @@ class ReportCycleItem(Model):
                    'pid': patient.id or '',
                    'hn': patient.hn_no,
                    'did': doctor.id,
-                   #'dname': doctor.name or "",
                    'dname': '%s %s'%(doctor.first_name or "", doctor.last_name or ""),
                    'dfirst': doctor.first_name or "",
                    'date': hdcase.date,
@@ -273,7 +272,6 @@ class ReportCycleItem(Model):
             'month': month_str,
             'date_from': date_from,
             'date_to': date_to,
-            'total_pt': pt,
             'total_fee': total_fee,
             'total_mdc': total_mdc,
             'total_pt': total_pt,
diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index 494f853..bf041bd 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/netforce_clinic/templates/report_cycle_item.hbs
@@ -14,6 +14,7 @@
         <th>แพทย์</th>
         <th>สิทธ์</th>
         <th style="text-align:left">ยาฉีด</th>
+        <th>HCT</th>
         <th>DZ</th>
         <th>N/U</th>
         <th>พยาบาล</th>
@@ -37,6 +38,7 @@
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                     <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
                     <td style="text-align:left">{{mdc_name}}</td>
+                    <td style="text-align:right">{{hct}}</td>
                     <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
                     <td>{{dlz_use}}</td>
                     <td><a href="/ui#name=clinic_cycle_item&active_id={{ctid}}&mode=form">{{nfirst_name}}</a></td>
@@ -53,6 +55,7 @@
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                     <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
                     <td style="text-align:left">{{mdc_name}}</td>
+                    <td style="text-align:right">{{hct}}</td>
                     <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
                     <td>{{dlz_use}}</td>
                     <td><a href="/ui#name=clinic_cycle_item&active_id={{ctid}}&mode=form">{{nfirst_name}}</a></td>
@@ -64,7 +67,7 @@
         <th rowspan="2" class="active">รวมผู้ป่วยทั้งหมด</th>
         <th rowspan="2" class="active"></th>
         <th class="active">{{total_pt}}</th>
-        <th colspan="7" class="active">
+        <th colspan="8" class="active">
             <p>
                 {{#each ptype_lines}}
                     {{name}} : {{qty}} &nbsp;&nbsp;&nbsp;