From 439c0d8f4cc2f698913b5ec57a5d54fcc4404c5d Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Sat, 20 Dec 2014 00:16:01 +0700
Subject: [PATCH] xxx

---
 .../layouts/clinic_cycle_item_form.xml            |  1 -
 netforce_clinic/layouts/clinic_hd_case_list.xml   | 15 +--------------
 netforce_clinic/models/hd_case.py                 |  8 ++++----
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index fc740aa..ba1243d 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -22,7 +22,6 @@
                     <field name="membrane_type" span="2"/>
                     <field name="vascular_acc" span="2"/>
                     <field name="bid_flow_rate" span="2"/>
-                    <field name="bid_flow_rate" span="2"/>
                     <field name="ultrafittration" span="2"/>
                     <field name="time_stop" span="2"/>
                     <field name="wt_stop" span="2"/>
diff --git a/netforce_clinic/layouts/clinic_hd_case_list.xml b/netforce_clinic/layouts/clinic_hd_case_list.xml
index af5d7c1..3c6acd8 100644
--- a/netforce_clinic/layouts/clinic_hd_case_list.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_list.xml
@@ -1,22 +1,9 @@
 <list model="clinic.hd.case" colors='{"#cfc":[["state","=","completed"]],"#f9e37d":[["state","=","in_progress"]],"#bcbbb9":[["state","=","cancelled"]],"#ACD1E9":[["state","=","waiting_payment"]],"#70DB93":[["state","=","paid"]]}'>
     <field name="number"/>
+    <field name="sickbed_id" span="2"/>
     <field name="date"/>
-    <field name="patient_id"/>
     <field name="cycle_id"/>
     <field name="department_id"/>
     <field name="doctor_id"/>
-    <field name="sickbed_id" span="2"/>
-    <field name="patient_id" span="2"/>
-    <field name="time_start" span="2"/>
-    <field name="wt_start" span="2"/>
-    <field name="bp_start" span="2"/>
-    <field name="membrane_type" span="2"/>
-    <field name="vascular_acc" span="2"/>
-    <field name="bid_flow_rate" span="2"/>
-    <field name="bid_flow_rate" span="2"/>
-    <field name="ultrafittration" span="2"/>
-    <field name="time_stop" span="2"/>
-    <field name="wt_stop" span="2"/>
-    <field name="bp_stop" span="2"/>
     <field name="state"/>
 </list>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 6d08590..d27c848 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -80,10 +80,10 @@ class HDCase(Model):
         "patient_type_id": fields.Many2One("clinic.patient.type", "Type",function="_get_patient_type"),
         "nurse_id": fields.Many2One("clinic.staff","Approve By", domain=[['type','=','nurse']]),
         "department_id": fields.Many2One("clinic.department", "Department",search=True),
-        "wt_start": fields.Float("Wt Start(kg)"),
-        "wt_stop": fields.Float("Wt Stop(kg)"),
-        "bp_start": fields.Char("BP Start"),
-        "bp_stop": fields.Char("BP Stop"),
+        "wt_start": fields.Float("Start Wt (Kg)"),
+        "wt_stop": fields.Float("Stop Wt (Kg)"),
+        "bp_start": fields.Char("Start BP"),
+        "bp_stop": fields.Char("Stop BP"),
         "membrane_type": fields.Selection([("unsub","Unsub cellul"),("sub","Sub cellul"),("synthetic","Synthetic")],"Member Type"),
         "hd_acc": fields.Selection([("o","O"),("i","I")],"HD Acc"),
         "hd_mode": fields.Selection([("chronic","Chronic"),("acute","Acute")],"HD Moode"),