From 973fafa5d408fa0ea9db7e79934ae1fb46053b47 Mon Sep 17 00:00:00 2001
From: "chayut.s" <chayut.s:wq@almacom.co.th>
Date: Mon, 20 Oct 2014 16:03:17 +0700
Subject: [PATCH 1/2] report

---
 .../layouts/clinic_hd_case_form.xml           |   4 +-
 netforce_clinic/models/__init__.py            |   5 +-
 netforce_clinic/models/hd_case.py             |  30 ++--
 netforce_clinic/models/report_hd_detail.py    | 152 +++++++++++++++++
 netforce_clinic/models/report_hd_madical.py   | 153 ++++++++++++++++++
 netforce_clinic/models/report_hd_summary.py   | 145 +++++++++++++++++
 netforce_clinic/models/visit.py               |   2 +-
 7 files changed, 475 insertions(+), 16 deletions(-)
 create mode 100644 netforce_clinic/models/report_hd_detail.py
 create mode 100644 netforce_clinic/models/report_hd_madical.py
 create mode 100644 netforce_clinic/models/report_hd_summary.py

diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index d03cdb9..7bdc242 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -26,8 +26,10 @@
             <field name="bp_start"/>
             <field name="per_bp_start"/>
             <field name="bp_stop"/>
-            <field name="per_bp_stop"/>
+            <field name="per_bp_stop"/> 
             <field name="hct" onchange="onchange_hct"/>
+            <newline/>
+            <field name="hct_alert"/>
             <field name="dialyzers" nolabel="1">
                 <list>
                     <field name="dialyzer_id" domain="[['patient_id','=',parent.patient_id],['state','=','active']]" onchange="onchange_dialyzer"/>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index a58cdde..51e1022 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -30,8 +30,9 @@ from . import file_sheet
 from . import cycle
 from . import gen_visit
 from . import gen_visit_line
-from . import report_hd_dialy
-from . import report_hd_monthly
+from . import report_hd_detail
+from . import report_hd_summary
 from . import payment
 from . import payment_line
 from . import input_data
+from . import report_hd_madical
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 95df288..5a32949 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -1,6 +1,6 @@
 import time
-from datetime import datetime
 
+from datetime import datetime
 from netforce.model import Model, fields, get_model
 from netforce.utils import get_data_path
 from netforce.access import get_active_user,set_active_user
@@ -22,6 +22,7 @@ class HDcase(Model):
             res[obj.id]=total_time
         return res
 
+    
     _fields={
         "number": fields.Char("Number",required=True,search=True),
         "time_start": fields.DateTime("Time start",required=True,search=True),
@@ -41,9 +42,9 @@ class HDcase(Model):
         "epo_tn" : fields.Char("EpoTn (Drug name)"),
         "epo_unit" : fields.Integer("EpoUnit (Unit of Used drug)"),
         "hct": fields.Integer("HCT %", required=True),
+        "hct_alert" : fields.Char("",function="onchange_hct",readonly=True,function_multi=True),
         "check_goverment_pay" : fields.Boolean("The Government Pay"),
         "check_personal_pay" : fields.Boolean("Pay yourself"),
-        "hct": fields.Integer("HCT %(>39)"),
         "state": fields.Selection([("draft","Draft"),("in_progress","In Progress"),("completed","Completed"),("discountinued","Discountinued"),("in_completed","In completed")],"Status",required=True),
         "dialyzers": fields.One2Many("clinic.dialyzer.line","hd_case_id","Dialyzers"),
         "lines": fields.One2Many("clinic.hd.case.line","hd_case_id","Lines"),
@@ -95,8 +96,7 @@ class HDcase(Model):
         "time_stop": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
         'nurse_id': _get_nurse,
         "number": _get_number,
-        "company_id": lambda *a: get_active_company(),
-        "fee": 1500,
+        "company_id": lambda *a: get_active_company()
     }
     _order="date desc,number desc"
 
@@ -171,13 +171,6 @@ class HDcase(Model):
         data['total']=total
         return data 
 
-    def onchange_hct(self,context={}): 
-        data=context['data']
-        hct=data['hct']
-        if(hct<=39):
-            data['hct']=0 
-        return data
-
     def cancelled(self,ids,context={}):
         obj=self.browse(ids)[0]
         obj.write({" state":"cancelled"})
@@ -460,6 +453,19 @@ class HDcase(Model):
         else:
             data['fee']=0.0
         return data
+        
+    def onchange_hct(self,context={}):
+        data=context['data']
+        hct_alert=data.get("hct","")
+        if(hct_alert<=36):
+            data['hct_alert']="Reimbursement of medicines : 1,125/Week"
+        elif(36<=hct_alert<=39):
+            data['hct_alert']="Reimbursement of medicines : 750/Week"
+        elif(hct_alert>39):
+            data['hct_alert']="Can not be drawn"
+        else:
+            data['hct_alert']=""
+        return data
 
     def undo(self,ids,context={}):
         obj=self.browse(ids)[0]
@@ -484,6 +490,6 @@ class HDcase(Model):
                'active_id': obj.id, 
             },
             'flash': '%s has been undo'%obj.number,
-        }
+         }
 
 HDcase.register()
diff --git a/netforce_clinic/models/report_hd_detail.py b/netforce_clinic/models/report_hd_detail.py
new file mode 100644
index 0000000..9ee6aec
--- /dev/null
+++ b/netforce_clinic/models/report_hd_detail.py
@@ -0,0 +1,152 @@
+import time
+import pprint
+
+from netforce.model import Model, fields, get_model
+
+class ReportHDDetail(Model):
+    _name="clinic.report.hd.detail"
+    _string="Hemodialysis Report Detail"
+    _transient=True
+    
+    _fields={
+        "patient_id" : fields.Many2One("clinic.patient","Patient"),
+        "doctor_id" : fields.Many2One("clinic.doctor","Doctor"),
+        "nurse_id" : fields.Many2One("clinic.nurse","Nurse"),
+        "date_from": fields.Date("From"),
+        "date_to": fields.Date("To"),
+        "cycle_id": fields.Many2One("clinic.cycle","Cycle"),
+    }
+
+    _defaults={
+        'date_from': lambda *a: time.strftime("%Y-%m-%d"),
+        'date_to': lambda *a: time.strftime("%Y-%m-%d"),
+    }
+
+    _order="cycle_id desc"
+    
+    
+    def get_report_data(self,ids,context={}):
+        # context=> dict
+        # inside context => keys => defaults => type => dict
+        # dict => key: value => '', 1, [], {}
+        # context['default'] => defaults(dict) => key => inside key => value => '2014-10-22'
+        date_from=time.strftime("%Y-%m-%d")
+        date_to=time.strftime("%Y-%m-%d")
+        # print('date_from ',date_from)
+        defaults=context.get("defaults")
+        if defaults:
+            if defaults.get("date_from"):
+                date_from=defaults['date_from']           
+            if defaults.get("date_to"):
+                date_to=defaults['date_to']
+        # date_to=context['date_to']
+        # default => key => dataults
+        # date_from=context['date_from']
+        # print(context['date_from'])
+        #'2014-10-13'
+        # print('date_from ',date_from)
+        # print('date_to ',date_to)
+        PATIENT_TYPE={
+            "mg":"Medical Government",
+            "sc":"Social Security",
+            "nhso":"NHSO (30฿)",
+            "personal": "Personal",
+            "others": "Others",
+        }
+        
+        dom=[]
+        dom.append(['state','=','completed'])
+        if ids:
+            obj=self.browse(ids)[0]
+            if obj.date_from:
+                date_from=obj.date_from
+            if obj.date_to:
+                date_to=obj.date_to
+            if obj.cycle_id:
+                dom.append([
+                    'cycle_id','=',obj.cycle_id.id,
+                ])
+            if obj.patient_id:
+                dom.append([
+                    'patient_id','=',obj.patient_id.id,
+                ])
+            if obj.doctor_id:
+                dom.append([
+                    'doctor_id','=',obj.doctor_id.id,
+                ])
+
+        dom.append(['time_start', ">=", date_from+" 00:00:00"])
+        dom.append(['time_stop',"<=", date_to+" 23:59:59"])        
+        lines=[]
+        cycles=[]
+        index=0
+        no_patient=0
+        for hd_case in get_model("clinic.hd.case").search_browse(dom,order="cycle_id.sequence"):
+            patient_type=hd_case.patient_id.type
+            patient_type=PATIENT_TYPE.get(patient_type)
+            #dialyzer_name=hd_case.dialyzers.id
+            #dialyzer_name=DIALYZER_NAME.get(dialyzer_name)
+            cycle_name=hd_case.cycle_id.name or ""
+            show_cycle=False
+            if not cycle_name in cycles:
+                cycles.append(cycle_name)
+                show_cycle=True
+                vals={
+                    'color': 'success',
+                    'show_cycle': False,
+                    'cycle' : "",
+                    'patient': "",
+                    'no_patient': no_patient,
+                    'patient_type' : "",
+                    'doctor' : "",
+                    'total' : "",
+                    'rc_no' : "",
+                    'dialyzer_name' : "",
+                    'nurse' : "",
+                }
+                lines.append(vals)
+                no_patient=1
+            else:
+                no_patient+=1
+            index+=1
+            vals={
+                'show_cycle': show_cycle,
+                'cycle' : cycle_name,
+                'patient': hd_case.patient_id.name,
+                'patient_type' : patient_type,
+                'no_patient': 0,
+                'doctor' : hd_case.doctor_id.name,
+                'total' : hd_case.total,
+                'rc_no' : hd_case.number,
+                'dialyzer_name' : 'DZ-xxx',
+                'nurse' : hd_case.nurse_id.name,
+            }
+            lines.append(vals)
+
+        # XXX
+        if lines:
+            vals={
+                'color': 'success',
+                'show_cycle': False,
+                'cycle' : "",
+                'patient': "",
+                'no_patient': no_patient,
+                'patient_type' : "",
+                'doctor' : "",
+                'total' : "",
+                'rc_no' : "",
+                'dialyzer_name' : "",
+                'nurse' : "",
+            }
+            lines.append(vals)
+            #XXX
+            del lines[0] 
+        data={
+            'lines': lines,
+            'same_date': date_from==date_to,
+            'date_from': date_from,
+            'date_to': date_to,
+        }
+        return data
+
+ReportHDDetail.register()
diff --git a/netforce_clinic/models/report_hd_madical.py b/netforce_clinic/models/report_hd_madical.py
new file mode 100644
index 0000000..b316a13
--- /dev/null
+++ b/netforce_clinic/models/report_hd_madical.py
@@ -0,0 +1,153 @@
+import time
+
+from datetime import datetime
+from calendar import monthrange
+from netforce.model import Model,fields
+
+class ReportHDMadical(Model):
+    _name="clinic.report.hd.madical"
+    _string="Hemodialysis Report Madical Summary"
+    _transient=True
+    
+    _fields={
+        "date": fields.Date("Month", required=True),
+    }
+
+    _defaults={
+        'date': lambda *a: time.strftime("%Y-%m-%d"),
+    }
+    
+    def get_report_data(self,ids,context={}):
+        date=datetime.now().strftime("%Y-%m-%d")
+        #datemonth=datetime.now().strftime("%m")
+        if ids:
+            obj=self.browse(ids)[0]
+            date=obj.date
+        year=int(date[0:4])
+        month=int(date[5:7])
+        month_str=datetime.strptime(date,'%Y-%m-%d').strftime("%B")
+        
+        next_month = str(month + 1)
+        if next_month == 13:
+            next_month = 12
+        #next_month_str=datetime.strptime(next_month,'%m').strftime("%B")
+        previous_month = str(month - 1)
+        if previous_month == 0:
+            previous_month = 12
+        #previous_month_str=datetime.strptime(previous_month,'%m').strftime("%B")
+        
+        #madical=get_model("clinic.hd.case.gm.line").search_browse()
+        #patients_mg=get_model("clinic.patient").search_browse(['type','=','mg'])
+        
+        weekday, total_day=monthrange(year, month)
+        time_start='2014-%s-01 00:00:00'%(month)
+        time_stop='2014-%s-%s 23:59:59'%(month,total_day)
+        
+        dom=[]
+        dom.append(['state','=','completed'])
+        dom.append(['time_start','>=',time_start])
+        dom.append(['time_stop','<=',time_stop])
+        #hd_cases=get_model("clinic.hd.case.gm.line").search_browse(dom)
+        
+        lines=[
+            {
+                'madical' : 'H4',
+                'sc': '437',
+                'uc': '',
+                'buy' : '4',
+                'total' : '441',
+            },
+            {
+                'madical' : 'H2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Epr4',
+                'sc': '216',
+                'uc': '',
+                'buy' : '',
+                'total' : '216',
+            },
+            {
+                'madical' : 'Epr2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Epk4',
+                'sc': '70',
+                'uc': '',
+                'buy' : '',
+                'total' : '70',
+            },
+            {
+                'madical' : 'Epk2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Epg4',
+                'sc': '98',
+                'uc': '',
+                'buy' : '',
+                'total' : '98',
+            },
+            {
+                'madical' : 'Epg2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Rng4',
+                'sc': '34',
+                'uc': '',
+                'buy' : '9',
+                'total' : '43',
+            },
+            {
+                'madical' : 'Rng2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Epi4',
+                'sc': '264',
+                'uc': '',
+                'buy' : '9',
+                'total' : '43',
+            },
+            {
+                'madical' : 'Epi2',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+            {
+                'madical' : 'Vnf',
+                'sc': '',
+                'uc': '',
+                'buy' : '',
+                'total' : '',
+            },
+        ]
+
+        data={
+            'month': month_str,
+            'year': year,
+            'lines': lines,
+        }
+        return data
+
+ReportHDMadical.register()
diff --git a/netforce_clinic/models/report_hd_summary.py b/netforce_clinic/models/report_hd_summary.py
new file mode 100644
index 0000000..bd4d8ce
--- /dev/null
+++ b/netforce_clinic/models/report_hd_summary.py
@@ -0,0 +1,145 @@
+import time
+
+from datetime import datetime
+from calendar import monthrange
+from netforce.model import Model, fields, get_model
+
+class ReportHDSummary(Model):
+    _name="clinic.report.hd.summary"
+    _string="Hemodialysis Report Summary"
+    _transient=True
+    
+    _fields={
+        "date": fields.Date("Month", required=True),
+    }
+
+    _defaults={
+        'date': lambda *a: time.strftime("%Y-%m-%d"),
+    }
+    
+    def get_report_data(self,ids,context={}):
+        date=datetime.now().strftime("%Y-%m-%d")
+        dom=[]
+        if ids:
+            obj=self.browse(ids)[0]
+            date=obj.date 
+
+        month=int(date[5:7])
+        year=int(date[0:4])
+        weekday, total_day=monthrange(year, month)
+        #date_from="%s-%s-01"%(year,month)
+        #date_to="%s-%s-%s"%(year,month,total_day)
+        month_str=datetime.strptime(date,'%Y-%m-%d').strftime("%B")
+        next_month = str(month + 1)
+        if next_month == 13:
+            next_month = 12
+        next_month_str=datetime.strptime(next_month,'%m').strftime("%B")
+
+        previous_month = month-1
+        if previous_month == 0:
+            previous_month = 12
+        #tip previous_month=str(month-1 == 0 and 12 or month)
+        previous_month_str=datetime.strptime('%s'%previous_month,'%m').strftime("%B")
+        
+        patients=get_model("clinic.patient").search_browse(['type','=','All'])
+        patients_mg=get_model("clinic.patient").search_browse(['type','=','mg'])
+        patients_sc=get_model("clinic.patient").search_browse(['type','=','sc'])
+        patients_nhso=get_model("clinic.patient").search_browse(['type','=','nhso'])
+        patients_pn=get_model("clinic.patient").search_browse(['type','=','personal'])
+        
+        new_patients=len(patients)
+
+        time_start='2014-%s-01'%(month) # 2014-10-20
+        time_stop='2014-%s-%s'%(month,total_day)
+
+        dom=[]
+        dom.append(['state','=','completed'])
+        dom.append(['time_start','>=',time_start])
+        dom.append(['time_stop','<=',time_stop])
+        cur_total_case=len(get_model("clinic.hd.case").search(dom))
+        
+        weekday, prev_total_day=monthrange(year, previous_month)
+        time_start_pre='2014-%s-01'%(previous_month) # 2014-10-20
+        time_stop_pre='2014-%s-%s'%(previous_month,prev_total_day)
+
+        dom=[]
+        dom.append(['state','=','completed'])
+        dom.append(['time_start','>=',time_start_pre])
+        dom.append(['time_stop','<=',time_stop_pre])
+        prev_total_case=len(get_model("clinic.hd.case").search(dom))
+            
+        lines=[
+            {
+                'topic': 'The number of times the Hemodialysis',
+                'month': month_str,
+                'amount': cur_total_case,
+                'date_from': time_start,
+                'date_to': time_stop,
+            },
+            {
+                'topic':'The number of cases brought',
+                'month': previous_month_str,
+                'amount': prev_total_case,
+                'date_from': time_start_pre,
+                'date_to': time_stop_pre,
+            },
+            {
+                'topic':'Number of new patients',
+                'month': month_str,
+                'amount': new_patients,
+                'date_from': time_start,
+                'date_to': time_stop,
+            },
+            {
+                'topic':'Number of patients discharged',
+                'month': month_str,
+                'amount': 'N/A',
+                'date_from': time_start,
+                'date_to': time_stop,
+            },
+            {
+                'topic':'The number of cases brought',
+                'month': next_month_str,
+                'amount': 0,
+                'date_from': time_start,
+                'date_to': time_stop,
+            },
+            {   
+                'topic':'Number of patients withdrawn Social Security',
+                'month': '',
+                'amount': len(patients_sc),
+                'date_from': "",
+                'date_to': "",
+            },
+            {
+                'topic':'Number of patients withdrawn Medical Government',
+                'month':'',
+                'amount': len(patients_mg),
+                'date_from': "",
+                'date_to': "",
+            },
+            {
+                'topic':'Number of patients withdrawn NHSO(30B)',
+                'month':'',
+                'amount': len(patients_nhso),
+                'date_from': "",
+                'date_to': "",
+            },
+            {
+                'topic':'Many patients pay themselves',
+                'month': '',
+                'amount': len(patients_pn),
+                'date_from': "",
+                'date_to': "",
+            },
+        ]
+
+        data={
+            'month': month_str,
+            'year': year,
+            'lines': lines,
+        }
+        #print("data", data)
+        return data
+
+ReportHDSummary.register()
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index af14153..962f045 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -13,7 +13,7 @@ class Visit(Model):
     _name_field="number"
     _multi_company=True
     
-    def _get_visit_date(self,ids,context):
+    def _get_visit_date(self,ids,context={}):
         res={}
         for obj in self.browse(ids):
             res[obj.id]=obj.time_start[0:10] 

From 0a4068fd91966fe5de7bb8dac0d3cfe42b7edf30 Mon Sep 17 00:00:00 2001
From: "chayut.s" <chayut.s:wq@almacom.co.th>
Date: Mon, 20 Oct 2014 18:48:39 +0700
Subject: [PATCH 2/2] fix error link report_summary

---
 .../actions/clinic_report_hd_detail.xml       |   8 ++
 .../actions/clinic_report_hd_madical.xml      |   8 ++
 .../actions/clinic_report_hd_summary.xml      |   8 ++
 netforce_clinic/actions/clinic_translate.xml  |   7 ++
 netforce_clinic/cd                            |   1 +
 netforce_clinic/layouts/clinic_menu.xml       |   7 +-
 .../layouts/clinic_report_hd_detail.xml       |  10 +++
 .../layouts/clinic_report_hd_madical.xml      |   3 +
 .../layouts/clinic_report_hd_summary.xml      |   3 +
 .../layouts/clinic_translate_form.xml         |   4 +
 .../layouts/clinic_translate_list.xml         |   4 +
 netforce_clinic/models/__init__.py            |   1 +
 netforce_clinic/models/hd_case.py             |   3 +-
 netforce_clinic/models/report_hd_detail.py    |   4 +
 netforce_clinic/models/report_hd_summary.py   |  26 +++---
 netforce_clinic/models/setting.py             |   3 +
 netforce_clinic/models/translate.py           |  13 +++
 netforce_clinic/reports/report_hd_detail.xlsx | Bin 0 -> 6092 bytes
 .../reports/report_hd_madical.xlsx            | Bin 0 -> 6302 bytes
 .../reports/report_hd_summary.xlsx            | Bin 0 -> 5298 bytes
 .../templates/report_hd_detail.hbs            |  84 ++++++++++++++++++
 .../templates/report_hd_madical.hbs           |  29 ++++++
 .../templates/report_hd_summary.hbs           |  25 ++++++
 23 files changed, 237 insertions(+), 14 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_report_hd_detail.xml
 create mode 100644 netforce_clinic/actions/clinic_report_hd_madical.xml
 create mode 100644 netforce_clinic/actions/clinic_report_hd_summary.xml
 create mode 100644 netforce_clinic/actions/clinic_translate.xml
 create mode 100644 netforce_clinic/cd
 create mode 100644 netforce_clinic/layouts/clinic_report_hd_detail.xml
 create mode 100644 netforce_clinic/layouts/clinic_report_hd_madical.xml
 create mode 100644 netforce_clinic/layouts/clinic_report_hd_summary.xml
 create mode 100644 netforce_clinic/layouts/clinic_translate_form.xml
 create mode 100644 netforce_clinic/layouts/clinic_translate_list.xml
 create mode 100644 netforce_clinic/models/translate.py
 create mode 100644 netforce_clinic/reports/report_hd_detail.xlsx
 create mode 100644 netforce_clinic/reports/report_hd_madical.xlsx
 create mode 100644 netforce_clinic/reports/report_hd_summary.xlsx
 create mode 100644 netforce_clinic/templates/report_hd_detail.hbs
 create mode 100644 netforce_clinic/templates/report_hd_madical.hbs
 create mode 100644 netforce_clinic/templates/report_hd_summary.hbs

diff --git a/netforce_clinic/actions/clinic_report_hd_detail.xml b/netforce_clinic/actions/clinic_report_hd_detail.xml
new file mode 100644
index 0000000..523c839
--- /dev/null
+++ b/netforce_clinic/actions/clinic_report_hd_detail.xml
@@ -0,0 +1,8 @@
+<action>                                                                                                         -->
+    <field name="string">HD Report Detail</field>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.report.hd.detail</field>
+    <field name="report_template">report_hd_detail</field>                                                      
+    <field name="report_template_xls">report_hd_detail</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                      
+</action>  
diff --git a/netforce_clinic/actions/clinic_report_hd_madical.xml b/netforce_clinic/actions/clinic_report_hd_madical.xml
new file mode 100644
index 0000000..4101bef
--- /dev/null
+++ b/netforce_clinic/actions/clinic_report_hd_madical.xml
@@ -0,0 +1,8 @@
+<action>                                                                                                         
+    <field name="string">Medical Report Summary</field>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.report.hd.madical</field>
+    <field name="report_template">report_hd_madical</field>                                                      
+    <field name="report_template_xls">report_hd_madical</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/actions/clinic_report_hd_summary.xml b/netforce_clinic/actions/clinic_report_hd_summary.xml
new file mode 100644
index 0000000..354018e
--- /dev/null
+++ b/netforce_clinic/actions/clinic_report_hd_summary.xml
@@ -0,0 +1,8 @@
+<action>                                                                                                         
+    <field name="string">HD Report Summary</field>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.report.hd.summary</field>
+    <field name="report_template">report_hd_summary</field>                                                      
+    <field name="report_template_xls">report_hd_summary</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/actions/clinic_translate.xml b/netforce_clinic/actions/clinic_translate.xml
new file mode 100644
index 0000000..4c174f1
--- /dev/null
+++ b/netforce_clinic/actions/clinic_translate.xml
@@ -0,0 +1,7 @@
+<action>
+    <field name="string">Translation</field>
+    <field name="view_cls">multi_view</field>
+    <field name="model">clinic.translate</field>
+    <field name="modes">list,form</field>
+    <field name="menu">clinic_menu</field>
+</action>
diff --git a/netforce_clinic/cd b/netforce_clinic/cd
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/netforce_clinic/cd
@@ -0,0 +1 @@
+#
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 904d368..74810d1 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -20,12 +20,15 @@
     <item string="Treatments" action="clinic_hd_case"/>
     <item string="Reports">
         <header string="HD CASE"/>
-        <item string="Daily" action="clinic_report_hd_dialy"/>
-        <item string="Monthly" action="clinic_report_hd_monthly"/>
+        <item string="HD Detail" action="clinic_report_hd_detail"/>
+        <item string="HD Summary" action="clinic_report_hd_summary"/>
+        <header string="HD Madical"/>
+        <item string="Madical Summary" action="clinic_report_hd_madical"/>
     </item>
     <item string="Settings">
         <item string="Cycles" action="clinic_cycle"/>
         <item string="Departments" action="clinic_department"/>
+        <item string="Translate" action="clinic_translate"/>
         <item string="Clinic Settings" action="clinic_setting"/>
     </item>
 </menu>
diff --git a/netforce_clinic/layouts/clinic_report_hd_detail.xml b/netforce_clinic/layouts/clinic_report_hd_detail.xml
new file mode 100644
index 0000000..b07f88c
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_report_hd_detail.xml
@@ -0,0 +1,10 @@
+<form model="clinic.report.hd.detail">
+    <group>
+        <field name="date_from" span="2"/>
+        <field name="date_to" span="2"/>
+        <field name="cycle_id" span="2"/>
+        <field name="patient_id" span="2"/>
+        <field name="nurse_id" span="2"/>
+        <field name="doctor_id" span="2"/>
+    </group>
+</form>
diff --git a/netforce_clinic/layouts/clinic_report_hd_madical.xml b/netforce_clinic/layouts/clinic_report_hd_madical.xml
new file mode 100644
index 0000000..fcd40ac
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_report_hd_madical.xml
@@ -0,0 +1,3 @@
+<form model="clinic.report.hd.madical">
+    <field name="date" mode="month" span="2"/>
+</form>
diff --git a/netforce_clinic/layouts/clinic_report_hd_summary.xml b/netforce_clinic/layouts/clinic_report_hd_summary.xml
new file mode 100644
index 0000000..decc455
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_report_hd_summary.xml
@@ -0,0 +1,3 @@
+<form model="clinic.report.hd.summary">
+    <field name="date" mode="month" span="2"/>
+</form>
diff --git a/netforce_clinic/layouts/clinic_translate_form.xml b/netforce_clinic/layouts/clinic_translate_form.xml
new file mode 100644
index 0000000..27c8779
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_translate_form.xml
@@ -0,0 +1,4 @@
+<form model="clinic.translate">
+    <field name="original_string"/>
+    <field name="translate"/>
+</form>
diff --git a/netforce_clinic/layouts/clinic_translate_list.xml b/netforce_clinic/layouts/clinic_translate_list.xml
new file mode 100644
index 0000000..38a44f2
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_translate_list.xml
@@ -0,0 +1,4 @@
+<list model="clinic.translate">
+    <field name="original_string"/>
+    <field name="translate"/>
+</list>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 4ce3c5e..1a77dc0 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -35,3 +35,4 @@ from . import payment
 from . import payment_line
 from . import input_data
 from . import report_hd_madical
+from . import translate
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 72b89d1..10099df 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -42,7 +42,7 @@ class HDcase(Model):
         "epo_tn" : fields.Char("EpoTn (Drug name)"),
         "epo_unit" : fields.Integer("EpoUnit (Unit of Used drug)"),
         "hct": fields.Integer("HCT %", required=True),
-        "hct_alert" : fields.Char("",function="onchange_hct",readonly=True,function_multi=True),
+        "hct_alert" : fields.Char("",readonly=True,function_multi=True),
         "check_goverment_pay" : fields.Boolean("The Government Pay"),
         "check_personal_pay" : fields.Boolean("Pay yourself"),
         "state": fields.Selection([("draft","Draft"),("in_progress","In Progress"),("completed","Completed"),("discountinued","Discountinued"),("in_completed","In completed")],"Status",required=True),
@@ -458,6 +458,7 @@ class HDcase(Model):
         
 
     def onchange_hct(self,context={}):
+        print(">"*50)
         data=context['data']
         hct_alert=data.get("hct","")
         if(hct_alert<=36):
diff --git a/netforce_clinic/models/report_hd_detail.py b/netforce_clinic/models/report_hd_detail.py
index 9ee6aec..cf7e506 100644
--- a/netforce_clinic/models/report_hd_detail.py
+++ b/netforce_clinic/models/report_hd_detail.py
@@ -70,6 +70,10 @@ class ReportHDDetail(Model):
                 dom.append([
                     'patient_id','=',obj.patient_id.id,
                 ])
+            if obj.nurse_id:
+                dom.append([
+                    'nurse_id','=',obj.nurse_id.id,
+                ])
             if obj.doctor_id:
                 dom.append([
                     'doctor_id','=',obj.doctor_id.id,
diff --git a/netforce_clinic/models/report_hd_summary.py b/netforce_clinic/models/report_hd_summary.py
index bd4d8ce..ca0412e 100644
--- a/netforce_clinic/models/report_hd_summary.py
+++ b/netforce_clinic/models/report_hd_summary.py
@@ -41,33 +41,37 @@ class ReportHDSummary(Model):
         #tip previous_month=str(month-1 == 0 and 12 or month)
         previous_month_str=datetime.strptime('%s'%previous_month,'%m').strftime("%B")
         
-        patients=get_model("clinic.patient").search_browse(['type','=','All'])
+        
+        time_start='2014-%s-01'%(month) # 2014-10-20
+        time_stop='2014-%s-%s'%(month,total_day)
+
+        dom=[]
+        dom.append(['time_start','>=',time_start])
+        dom.append(['time_stop','<=',time_stop])  
+
+        patients=get_model("clinic.patient").search_browse(['type','=','All'])    
+        new_patients=len(patients)
         patients_mg=get_model("clinic.patient").search_browse(['type','=','mg'])
         patients_sc=get_model("clinic.patient").search_browse(['type','=','sc'])
         patients_nhso=get_model("clinic.patient").search_browse(['type','=','nhso'])
         patients_pn=get_model("clinic.patient").search_browse(['type','=','personal'])
-        
-        new_patients=len(patients)
-
-        time_start='2014-%s-01'%(month) # 2014-10-20
-        time_stop='2014-%s-%s'%(month,total_day)
-
+          
         dom=[]
         dom.append(['state','=','completed'])
         dom.append(['time_start','>=',time_start])
         dom.append(['time_stop','<=',time_stop])
         cur_total_case=len(get_model("clinic.hd.case").search(dom))
-        
+
         weekday, prev_total_day=monthrange(year, previous_month)
         time_start_pre='2014-%s-01'%(previous_month) # 2014-10-20
         time_stop_pre='2014-%s-%s'%(previous_month,prev_total_day)
-
+        
         dom=[]
         dom.append(['state','=','completed'])
         dom.append(['time_start','>=',time_start_pre])
         dom.append(['time_stop','<=',time_stop_pre])
         prev_total_case=len(get_model("clinic.hd.case").search(dom))
-            
+        
         lines=[
             {
                 'topic': 'The number of times the Hemodialysis',
@@ -100,7 +104,7 @@ class ReportHDSummary(Model):
             {
                 'topic':'The number of cases brought',
                 'month': next_month_str,
-                'amount': 0,
+                'amount': 'N/A',
                 'date_from': time_start,
                 'date_to': time_stop,
             },
diff --git a/netforce_clinic/models/setting.py b/netforce_clinic/models/setting.py
index 4c9d05c..4dd86c3 100644
--- a/netforce_clinic/models/setting.py
+++ b/netforce_clinic/models/setting.py
@@ -17,6 +17,9 @@ class ClinicSetting(Model):
         "sc_partner_id": fields.Many2One("partner","Partner Social Security"),
         "ar_sc_id": fields.Many2One("account.account","Account Receiveble Social Security"),
         "ap_sc_id": fields.Many2One("account.account","Account Payment Social Security"),
+        #"ori_str": fields.Char("ori_str","Original String"),
+        #"translate": fields.Char("translate","Translation"),
+
     }
 
 ClinicSetting.register()
diff --git a/netforce_clinic/models/translate.py b/netforce_clinic/models/translate.py
new file mode 100644
index 0000000..9ad41b1
--- /dev/null
+++ b/netforce_clinic/models/translate.py
@@ -0,0 +1,13 @@
+from netforce.model import Model, fields
+
+class Translate(Model):
+    _name="clinic.translate"
+    _string="Translate"
+
+    _fields={
+        "original_string": fields.Char("original_string","Original String",required=True,search=True),
+        "translate": fields.Char("translate","Translate"),
+    }
+     
+
+Translate.register()
diff --git a/netforce_clinic/reports/report_hd_detail.xlsx b/netforce_clinic/reports/report_hd_detail.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f8cb9027271e05bc4433addb84350e09abc5f64a
GIT binary patch
literal 6092
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

literal 0
HcmV?d00001

diff --git a/netforce_clinic/reports/report_hd_madical.xlsx b/netforce_clinic/reports/report_hd_madical.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a802b45a05e7229ef0b89fc6b4b654c2a6e2fba1
GIT binary patch
literal 6302
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

literal 0
HcmV?d00001

diff --git a/netforce_clinic/reports/report_hd_summary.xlsx b/netforce_clinic/reports/report_hd_summary.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..2e639747d21bd582953078831307070dfaf3fcb8
GIT binary patch
literal 5298
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

literal 0
HcmV?d00001

diff --git a/netforce_clinic/templates/report_hd_detail.hbs b/netforce_clinic/templates/report_hd_detail.hbs
new file mode 100644
index 0000000..f1907a5
--- /dev/null
+++ b/netforce_clinic/templates/report_hd_detail.hbs
@@ -0,0 +1,84 @@
+<center>
+    <h2>Detail of the Hemodialysis</h2>
+    <h3>Clinic [Ratchawat]</h3>
+    <h4>
+    {{#if same_date}}
+        As at {{fmt_date date_from}}
+    {{else}}
+        From {{fmt_date date_from}} to {{fmt_date date_to}}
+    {{/if}}
+    </h4>
+</center>
+<table class="table table-striped">
+    <thead class="scroll-header">
+        <tr>
+			<th>
+                Cycle
+            </th>
+            <th>
+                Patient
+            </th>
+            <th>
+                Doctor
+            </th>
+            <th>
+                Patient Type
+            </th>
+            <th>
+                HD Fee
+            </th>
+            <th>
+                RC.No
+            </th>
+            <th>
+                Dialyzer
+            </th>
+            <th>
+                Nurse
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+		 {{#each lines context=context}}
+            {{#if show_cycle}}
+                <tr>
+                    <td colspan="10" style="font-weight:bold">
+                        {{cycle}}
+                    </td>
+                </tr>
+            {{/if}}
+            <tr class="{{color}}">
+                {{#if no_patient}}
+                    <td><b>TOTAL</b></td>
+                    <td>{{no_patient}}</td>
+                {{else}}
+                    <td></td>
+                    <td>{{patient}}</td>
+                {{/if}}
+                <td>
+                    {{doctor}}
+                </td>
+                <td>
+                    {{patient_type}}
+                </td>
+                <td>
+                    {{total}}
+                </td>
+                <td>
+                    {{rc_no}}
+                </td>
+                <td>
+					{{dialyzer_name}}
+                </td>
+                <td>
+                    {{nurse}}
+                </td>
+            </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+        <tr style="font-weight:bold">
+           
+        </tr>
+    </tfoot>
+</table>
diff --git a/netforce_clinic/templates/report_hd_madical.hbs b/netforce_clinic/templates/report_hd_madical.hbs
new file mode 100644
index 0000000..dabd546
--- /dev/null
+++ b/netforce_clinic/templates/report_hd_madical.hbs
@@ -0,0 +1,29 @@
+<center>
+    <h2>
+	Summary of the Madical
+    </h2>
+    <h3>
+	[Ratchawat : Saamsan4]<br/>
+        As at {{month}} {{year}}
+    </h3>
+</center>
+<table class="table table-striped">
+    <thead class="scroll-header">
+        <th>Madical</th>
+        <th>Social Security</th>
+        <th>uc</th>
+        <th>Buy</th>
+        <th>Total</th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr> 
+                <td>{{madical}}</td>
+                <td>{{sc}}</td>
+                <td>{{uc}}</td>
+                <td style color="red"></style>{{buy}}</td>
+                <td style color="blue"></style>{{total}}</td>
+            </tr>
+        {{/each}}
+    </tbody>
+</table>
diff --git a/netforce_clinic/templates/report_hd_summary.hbs b/netforce_clinic/templates/report_hd_summary.hbs
new file mode 100644
index 0000000..665c8b1
--- /dev/null
+++ b/netforce_clinic/templates/report_hd_summary.hbs
@@ -0,0 +1,25 @@
+<center>
+    <h2>
+	Summary of the Hemodialysis
+    </h2>
+    <h3>
+	[Ratchawat : Saamsan4]<br/>
+        As at {{month}} {{year}}
+    </h3>
+</center>
+<table class="table table-striped">
+    <thead class="scroll-header">
+        <th>Topic</th>
+        <th>Month</th>
+        <th>Amount</th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr> 
+                <td>{{topic}}</td>
+                <td>{{month}}</td>
+                <td><a style="text-decoration: underline" href="ui#name=clinic_report_hd_detail&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}" >{{amount}}</a></td>
+            </tr>
+        {{/each}}
+    </tbody>
+</table>