From b1cbccd312059488d5df532b10f1d42e72b18477 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Thu, 23 Nov 2017 11:25:06 +0700 Subject: [PATCH] revise hdcase summary using patient.move data --- .../actions/clinic_patient_move.xml | 11 ++ .../actions/report_hdcase_summary.xml | 9 ++ netforce_clinic/layouts/clinic_menu.xml | 1 + .../layouts/clinic_patient_form.xml | 1 + .../layouts/clinic_patient_move_form.xml | 7 + .../layouts/clinic_patient_move_list.xml | 7 + .../layouts/report_hdcase_summary.xml | 8 + netforce_clinic/models/__init__.py | 4 + netforce_clinic/models/patient.py | 3 + netforce_clinic/models/patient_move.py | 18 ++- .../models/report_hdcase_summary.py | 101 ++++++++++++ .../reports/report_hdcase_summary.xlsx | Bin 0 -> 6630 bytes .../templates/report_hdcase_summary.hbs | 152 ++++++++++++++++++ 13 files changed, 315 insertions(+), 7 deletions(-) create mode 100644 netforce_clinic/actions/clinic_patient_move.xml create mode 100644 netforce_clinic/actions/report_hdcase_summary.xml create mode 100644 netforce_clinic/layouts/clinic_patient_move_form.xml create mode 100644 netforce_clinic/layouts/clinic_patient_move_list.xml create mode 100644 netforce_clinic/layouts/report_hdcase_summary.xml create mode 100644 netforce_clinic/models/report_hdcase_summary.py create mode 100644 netforce_clinic/reports/report_hdcase_summary.xlsx create mode 100644 netforce_clinic/templates/report_hdcase_summary.hbs diff --git a/netforce_clinic/actions/clinic_patient_move.xml b/netforce_clinic/actions/clinic_patient_move.xml new file mode 100644 index 0000000..6f1d35a --- /dev/null +++ b/netforce_clinic/actions/clinic_patient_move.xml @@ -0,0 +1,11 @@ + + Patient Moves + multi_view + clinic.patient.move + [ + ["All",[[]]], + ["In",[["type","=","in"]]], + ["Out",[["type","=","out"]]]] + + clinic_menu + diff --git a/netforce_clinic/actions/report_hdcase_summary.xml b/netforce_clinic/actions/report_hdcase_summary.xml new file mode 100644 index 0000000..79b0a27 --- /dev/null +++ b/netforce_clinic/actions/report_hdcase_summary.xml @@ -0,0 +1,9 @@ + + HD Case Summary (Revise) + report + report.hdcase.summary + report_hdcase_summary + report_hdcase_summary + 1 + clinic_menu + diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 875bc87..ac18b10 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -42,6 +42,7 @@ + diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml index 8a6a94d..d660fff 100644 --- a/netforce_clinic/layouts/clinic_patient_form.xml +++ b/netforce_clinic/layouts/clinic_patient_form.xml @@ -133,6 +133,7 @@ + diff --git a/netforce_clinic/layouts/clinic_patient_move_form.xml b/netforce_clinic/layouts/clinic_patient_move_form.xml new file mode 100644 index 0000000..7290868 --- /dev/null +++ b/netforce_clinic/layouts/clinic_patient_move_form.xml @@ -0,0 +1,7 @@ +
+ + + + + + diff --git a/netforce_clinic/layouts/clinic_patient_move_list.xml b/netforce_clinic/layouts/clinic_patient_move_list.xml new file mode 100644 index 0000000..0c64ed1 --- /dev/null +++ b/netforce_clinic/layouts/clinic_patient_move_list.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/netforce_clinic/layouts/report_hdcase_summary.xml b/netforce_clinic/layouts/report_hdcase_summary.xml new file mode 100644 index 0000000..1f4c704 --- /dev/null +++ b/netforce_clinic/layouts/report_hdcase_summary.xml @@ -0,0 +1,8 @@ +
+ + + + + + + diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py index 9a690ab..b916ed5 100644 --- a/netforce_clinic/models/__init__.py +++ b/netforce_clinic/models/__init__.py @@ -149,3 +149,7 @@ from . import create_invoice_payment from . import report_stock_card from . import report_receipt_summary from . import report_wizard_labor_cost + +#revise +from . import patient_move +from . import report_hdcase_summary diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py index 239b348..58bb9eb 100644 --- a/netforce_clinic/models/patient.py +++ b/netforce_clinic/models/patient.py @@ -178,6 +178,7 @@ class Patient(Model): 'location': fields.Char("Share Department"), #to filter 'cw_time': fields.DateTime("Cycle Updated"), 'cw_uid': fields.Many2One("base.user"," Cycle Edit"), + "moves": fields.One2Many("clinic.patient.move","patient_id","Moves"), } def _get_number(self,context={}): @@ -327,6 +328,8 @@ class Patient(Model): obj.write({ 'partner_id': partner_id, }) + + #TODO create patient.move return obj_id def delete(self,ids,context={}): diff --git a/netforce_clinic/models/patient_move.py b/netforce_clinic/models/patient_move.py index 992c736..4d94992 100644 --- a/netforce_clinic/models/patient_move.py +++ b/netforce_clinic/models/patient_move.py @@ -1,17 +1,21 @@ import time -from netforce.model import Model, fields +from netforce.model import Model, fields, get_model class PatientMove(Model): - _name="clinic.patient.move" + _name='clinic.patient.move' + _fields={ - 'patient_id': fields.Many2One('clinic.patient','Patient'), - 'date': fields.DateTime("Date"), - 'location_id': fields.Many2One("clinic.department","Department"), + 'patient_id': fields.Many2One("clinic.patient", "Patient", required=True, on_delete="cascade"), + "date": fields.DateTime("Date"), + "patient_name": fields.Char("Patient Name"), + "patient_type": fields.Char("Patient Type"), #ปกส. .... + "type": fields.Selection([['in','In'],['out','Out']], 'Type', required=True), } - + + _defaults={ 'date': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"), } -PatientMove() +PatientMove.register() diff --git a/netforce_clinic/models/report_hdcase_summary.py b/netforce_clinic/models/report_hdcase_summary.py new file mode 100644 index 0000000..9167607 --- /dev/null +++ b/netforce_clinic/models/report_hdcase_summary.py @@ -0,0 +1,101 @@ +import time +import urllib.parse as urllib + +from datetime import datetime +from calendar import monthrange +from netforce.model import Model, fields, get_model +from netforce.access import get_active_company, get_active_user + +from . import utils + +class ReportHDCaseSummary(Model): + _name="report.hdcase.summary" + _string="Report HDCase Summary" + _transient=True + + _fields={ + "date": fields.Date("Month", required=True), + "date_from": fields.Date("From", required=True), + "date_to": fields.Date("To", required=True), + 'branch_id': fields.Many2One("clinic.branch","Branch"), + 'department_id': fields.Many2One("clinic.department","Departments"), + 'hdcase_type': fields.Selection([['completed','Completed'],['not_completed','Not Completed']],"HDCase Type"), + } + + def _get_date_from(self,context={}): + year,month=time.strftime("%Y-%m").split("-") + return '%s-%s-01'%(year,month) + + def _get_date_to(self,context={}): + year,month,day=time.strftime("%Y-%m-%d").split("-") + weekday, total_day=monthrange(int(year), int(month)) + return "%s-%s-%s"%(year,month,total_day) + + def _get_branch(self,context={}): + res=get_model('select.company').get_select() + if res: + return res['branch_id'] + + def _get_department(self,context={}): + res=get_model('select.company').get_select() + if res: + if res.get("department_ids"): + return res['department_ids'][0] + else: + return res['department_id'] + + _defaults={ + 'date': lambda *a: time.strftime("%Y-%m-%d"), + 'date_from': _get_date_from, + 'date_to': _get_date_to, + 'branch_id': _get_branch, + 'department_id': _get_department, + 'hdcase_type': 'completed', + } + + def get_report_data(self,ids,context={}): + company_id=get_active_company() + company=get_model("company").browse(company_id) + date=datetime.now().strftime("%Y-%m-%d") + year=int(date[0:4]) + crr_month=int(date[5:7]) + weekday, crr_total_day=monthrange(year, crr_month) + defaults=self.default_get(context=context) + date_from=defaults.get('date_from',date) + date_to=defaults.get('date_to',date) + branch_id=defaults.get("branch_id",None) + department_id=defaults.get("department_id",None) + hdcase_type=defaults.get('hdcase_type','completed') + #TODO get data from clinic.patient.move + #DO SOME STAFF + data={} + return data + + def onchange_date(self,context={}): + data=context['data'] + date=data['date'] + year,month,day=date.split("-") + weekday, total_day=monthrange(int(year), int(month)) + data['date_from']="%s-%s-01"%(year,month) + data['date_to']="%s-%s-%s"%(year,month,total_day) + return data + + def onchange_branch(self,context={}): + data=context['data'] + data['department_id']=None + return data + + def run_report(self,ids,context={}): + return { + 'next': { + 'name': 'clinic_print_hd_case_summary', + 'refer_id': ids[0], + 'action_options': 'convert=pdf', + } + } + + def export_pdf(self,ids,context={}): + raise Exception("TODO") + return + +ReportHDCaseSummary.register() diff --git a/netforce_clinic/reports/report_hdcase_summary.xlsx b/netforce_clinic/reports/report_hdcase_summary.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..8a209fd55d6548cb32641d0617e570f026640103 GIT binary patch literal 6630 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 A_5c6? literal 0 HcmV?d00001 diff --git a/netforce_clinic/templates/report_hdcase_summary.hbs b/netforce_clinic/templates/report_hdcase_summary.hbs new file mode 100644 index 0000000..017ee66 --- /dev/null +++ b/netforce_clinic/templates/report_hdcase_summary.hbs @@ -0,0 +1,152 @@ +
+

+ {{title}} +

+

+ {{parent_company_name}} {{company_name}}
+

+

+ From {{date_from}} To {{date_to}} +

+
+ + + + + + + + + + {{#each lines}} + + + + + {{#ifeq qty '0'}} + + {{else}} + + {{/ifeq}} + + + {{/each}} + +
{{topic}}{{month}}เท่ากับ + {{qty}} + {{unit}}
+ + + + + + + + + + + + + +
+
+ + รายชื่อผู้ป่วยรับใหม่ + +
+ 		+
+ + รายชื่อผู้ป่วยจำหน่าย + +
+
+ + + + + + + + {{#if recent_patients}} + {{#each recent_patients}} + + + + + + {{/each}} + {{else}} + + + + {{/if}} + + + +
#วันที่ชื่อ
{{no}}{{reg_date}} + {{view "link" string=name action="clinic_patient" action_options="mode=form" active_id=pid}} +
+ No items to display. +
+ 		+ + + + + + + + {{#if resign_patients}} + {{#each resign_patients}} + + + + + + {{/each}} + {{else}} + + + + {{/if}} + + + +
#วันที่ชื่อ
{{no}}{{resign_date}} + {{view "link" string=name action="clinic_patient" action_options="mode=form" active_id=pid}} +
+ No items to display. +
+
+ +
+ + รวมจำนวนยาที่ใช้ประจำเดือน + +
+ + + + {{#each titles}} + + {{/each}} + + + {{#each medicals}} + + + {{#each sub_lines}} + + {{/each}} + + {{/each}} + + + +
{{name}}
+ {{prod_name}} + + {{qty}} +
+