improve
watcha.h
parent
e28bec6514
commit
790e601425
|
|
@ -0,0 +1,6 @@
|
||||||
|
<action>
|
||||||
|
<field name="view_cls">form_view</field>
|
||||||
|
<field name="model">clinic.hd.case.print</field>
|
||||||
|
<field name="view_xml">clinic_hd_case_print</field>
|
||||||
|
<field name="menu">clinic_menu</field>
|
||||||
|
</action>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<action>
|
||||||
|
<field name="type">report_odt2</field>
|
||||||
|
<field name="model">clinic.hd.case.print</field>
|
||||||
|
<field name="method">get_report_data</field>
|
||||||
|
<field name="template">hd_case_summary_pdf</field>
|
||||||
|
</action>
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
<field name="lines" nolabel="1">
|
<field name="lines" nolabel="1">
|
||||||
<list>
|
<list>
|
||||||
<field name="nurse_id" domain='[["type","=","nurse"]]' onchange="onchange_nurse"/>
|
<field name="nurse_id" domain='[["type","=","nurse"]]' onchange="onchange_nurse"/>
|
||||||
<!--<field name="level_id"/>-->
|
<field name="level_id"/>
|
||||||
<!--<field name="categ_id"/>-->
|
<field name="categ_id"/>
|
||||||
</list>
|
</list>
|
||||||
</field>
|
</field>
|
||||||
</tab>
|
</tab>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
<form title="HD Case Summary (PDF)" model="clinic.hd.case.print">
|
||||||
|
<head>
|
||||||
|
<button string="Print" dropdown="1" icon="print">
|
||||||
|
<item string="PDF" action="clinic_hd_case_print" action_options="convert=pdf"/>
|
||||||
|
</button>
|
||||||
|
</head>
|
||||||
|
<field name="date" span="3" mode="month" onchange="onchange_date"/>
|
||||||
|
<field name="date_from" span="3"/>
|
||||||
|
<field name="date_from" span="3"/>
|
||||||
|
<button string="Print" action="clinic_hd_case_print" action_options="convert=pdf"/>
|
||||||
|
</form>
|
||||||
|
|
@ -6,9 +6,9 @@
|
||||||
</button>
|
</button>
|
||||||
<button string="Options" dropdown="1">
|
<button string="Options" dropdown="1">
|
||||||
<item string="To Draft" method="to_draft" states="approved"/>
|
<item string="To Draft" method="to_draft" states="approved"/>
|
||||||
<item string="Select Type" action="clinic_matching_payment_popup"/>
|
<item string="Select Type" action="clinic_matching_payment_popup" states="draft"/>
|
||||||
<item string="Update ID Card" method="update_id"/>
|
<item string="Update ID Card" method="update_id" states="draft"/>
|
||||||
<item string="Reset Items" method="clear_line" confirm="Are you sure?"/>
|
<item string="Reset Items" method="clear_line" states="draft" confirm="Are you sure?"/>
|
||||||
</button>
|
</button>
|
||||||
</head>
|
</head>
|
||||||
<field name="date" onchange="onchange_date" mode="month" span="3"/>
|
<field name="date" onchange="onchange_date" mode="month" span="3"/>
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@
|
||||||
<item string="Reporting" perm="clinic_report">
|
<item string="Reporting" perm="clinic_report">
|
||||||
<item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
|
<item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
|
||||||
<item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
|
<item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
|
||||||
|
<!--<item string="HD Case Summary(PDF)" action="clinic_hd_case_print"/>-->
|
||||||
<item string="Medical Summary" action="clinic_report_medical_summary"/>
|
<item string="Medical Summary" action="clinic_report_medical_summary"/>
|
||||||
<item string="Recent Patient" action="clinic_report_recent_patient"/>
|
<item string="Recent Patient" action="clinic_report_recent_patient"/>
|
||||||
<item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
|
<item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,5 @@
|
||||||
<field name="date_to" span="2"/>
|
<field name="date_to" span="2"/>
|
||||||
<field name="branch_id" onchange="onchange_branch" span="3"/>
|
<field name="branch_id" onchange="onchange_branch" span="3"/>
|
||||||
<field name="department_id" domain='[["branch_id","=",branch_id]]' span="3"/>
|
<field name="department_id" domain='[["branch_id","=",branch_id]]' span="3"/>
|
||||||
|
<!--<button string="PDF" method="run_report" icon="print" size="small"/>-->
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,8 @@
|
||||||
</group>
|
</group>
|
||||||
</tab>
|
</tab>
|
||||||
<tab string="Working Location">
|
<tab string="Working Location">
|
||||||
<!--<field name="branch_id" required="1"/>-->
|
<field name="branch_id" required="1"/>
|
||||||
<!--<field name="department_id" domain='[["branch_id","=",branch_id]]' required="1"/>-->
|
<field name="department_id" domain='[["branch_id","=",branch_id]]' required="1"/>
|
||||||
<field name="departments"/>
|
<field name="departments"/>
|
||||||
</tab>
|
</tab>
|
||||||
<tab string="Professional Information">
|
<tab string="Professional Information">
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ from . import hd_case_popup_discontinue
|
||||||
from . import hd_case_popup_dlz
|
from . import hd_case_popup_dlz
|
||||||
from . import hd_case_payment
|
from . import hd_case_payment
|
||||||
from . import hd_case_dialyzer
|
from . import hd_case_dialyzer
|
||||||
|
from . import hd_case_print
|
||||||
from . import dialyzer
|
from . import dialyzer
|
||||||
from . import cycle
|
from . import cycle
|
||||||
from . import cycle_item
|
from . import cycle_item
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,268 @@
|
||||||
|
import time
|
||||||
|
from datetime import datetime
|
||||||
|
from calendar import monthrange
|
||||||
|
|
||||||
|
from netforce.model import Model, fields, get_model
|
||||||
|
from netforce.access import get_active_company
|
||||||
|
from . import utils
|
||||||
|
|
||||||
|
class HDCasePrint(Model):
|
||||||
|
_name="clinic.hd.case.print"
|
||||||
|
_transient=True
|
||||||
|
|
||||||
|
_fields={
|
||||||
|
"date": fields.Date("Month"),
|
||||||
|
"date_from": fields.Date("From", required=True),
|
||||||
|
"date_to": fields.Date("To", required=True),
|
||||||
|
}
|
||||||
|
|
||||||
|
def default_get(self,field_names=None,context={},**kw):
|
||||||
|
defaults=context.get("defaults",{})
|
||||||
|
date=defaults.get('date',time.strftime("%Y-%m-%d"))
|
||||||
|
year,month=time.strftime("%Y-%m").split("-")
|
||||||
|
weekday, total_day=monthrange(int(year), int(month))
|
||||||
|
date_from=defaults.get('date_from','%s-%s-01'%(year,month))
|
||||||
|
date_to=defaults.get('date_to',"%s-%s-%s"%(year,month,total_day))
|
||||||
|
res={
|
||||||
|
'date': date,
|
||||||
|
'date_from': date_from,
|
||||||
|
'date_to': date_to,
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
|
||||||
|
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 get_data(self,context={}):
|
||||||
|
return
|
||||||
|
|
||||||
|
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)
|
||||||
|
branch_id=None
|
||||||
|
department_id=None
|
||||||
|
time_start='%s-%s-01 00:00:00'%(year,str(crr_month).zfill(2))
|
||||||
|
time_stop='%s-%s-%s 23:59:59'%(year,str(crr_month).zfill(2),crr_total_day)
|
||||||
|
if ids:
|
||||||
|
obj=self.browse(ids)[0]
|
||||||
|
branch_id=obj.branch_id.id
|
||||||
|
department_id=obj.department_id.id
|
||||||
|
date=obj.date
|
||||||
|
crr_month=int(date[5:7]) #XXX
|
||||||
|
time_start='%s 00:00:00'%obj.date_from
|
||||||
|
time_stop='%s 23:59:59'%obj.date_to
|
||||||
|
year=int(date[0:4])
|
||||||
|
|
||||||
|
prev_year=year
|
||||||
|
next_year=year
|
||||||
|
prev_month=crr_month-1
|
||||||
|
next_month=crr_month+1
|
||||||
|
if crr_month==1:
|
||||||
|
prev_month=12
|
||||||
|
prev_year-=1
|
||||||
|
if crr_month==12:
|
||||||
|
next_month=1
|
||||||
|
next_year+=1
|
||||||
|
|
||||||
|
month_str=utils.MONTHS['th_TH'][crr_month]
|
||||||
|
next_month_str=utils.MONTHS['th_TH'][next_month]
|
||||||
|
prev_month_str=utils.MONTHS['th_TH'][prev_month]
|
||||||
|
|
||||||
|
def encode_url(dom):
|
||||||
|
dom='%s'%dom
|
||||||
|
dom=urllib.quote(dom.encode('utf-8'))
|
||||||
|
return dom
|
||||||
|
|
||||||
|
def replace_quote(dom=""):
|
||||||
|
return dom.replace("'","\"")
|
||||||
|
|
||||||
|
count=1
|
||||||
|
# number of hd case of this month
|
||||||
|
dom=[]
|
||||||
|
dom.append(["time_start",">=",time_start])
|
||||||
|
dom.append(["time_stop","<=",time_stop])
|
||||||
|
dom.append(["state","in",["completed","waiting_payment","paid"]])
|
||||||
|
dom.append(['patient_id.walkin','=','no'])
|
||||||
|
if branch_id:
|
||||||
|
dom.append(['branch_id','=',branch_id])
|
||||||
|
if department_id:
|
||||||
|
dom.append(['department_id','=',department_id])
|
||||||
|
crr_total=len(get_model("clinic.hd.case").search(dom))
|
||||||
|
items={}
|
||||||
|
items['topic%s'%count]={
|
||||||
|
'month': month_str,
|
||||||
|
'qty': crr_total or 0,
|
||||||
|
'action': 'clinic_hd_case',
|
||||||
|
'action_options': 'mode=list&search_domain=%s&tab_no=0'%replace_quote('%s'%dom),
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
|
||||||
|
# number of patient from previous
|
||||||
|
dom=[]
|
||||||
|
weekday, prev_total_day=monthrange(prev_year, prev_month)
|
||||||
|
time_stop='%s-%s-%s'%(prev_year,str(prev_month).zfill(2),prev_total_day)
|
||||||
|
dom.append(['reg_date','<=',time_stop])
|
||||||
|
if branch_id:
|
||||||
|
dom.append(['branch_id','=',branch_id])
|
||||||
|
if department_id:
|
||||||
|
dom.append(['department_id','=',department_id])
|
||||||
|
npatient=len(get_model("clinic.patient").search(dom))
|
||||||
|
dom=replace_quote('%s'%dom)
|
||||||
|
items['topic%s'%count]={
|
||||||
|
'month': prev_month_str,
|
||||||
|
'qty': npatient or 0,
|
||||||
|
'action': 'clinic_patient',
|
||||||
|
'action_options': 'mode=list&search_domain=%s'%dom,
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
|
||||||
|
# new patient of this month
|
||||||
|
dom=[]
|
||||||
|
weekday, crr_total_day=monthrange(prev_year, crr_month)
|
||||||
|
time_start='%s-%s-01'%(year,str(crr_month).zfill(2))
|
||||||
|
time_stop='%s-%s-%s'%(year,str(crr_month).zfill(2),crr_total_day)
|
||||||
|
dom.append(['reg_date','>=',time_start])
|
||||||
|
dom.append(['reg_date','<=',time_stop])
|
||||||
|
if branch_id:
|
||||||
|
dom.append(['branch_id','=',branch_id])
|
||||||
|
if department_id:
|
||||||
|
dom.append(['department_id','=',department_id])
|
||||||
|
new_patients=get_model('clinic.patient').search_browse(dom)
|
||||||
|
dom=replace_quote('%s'%dom)
|
||||||
|
items['topic%s'%count]={
|
||||||
|
'month': month_str,
|
||||||
|
'qty': len(new_patients) or 0,
|
||||||
|
'action': 'clinic_patient',
|
||||||
|
'action_options': 'mode=list&search_domain=%s'%dom,
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
|
||||||
|
# number for patient who resign for this month
|
||||||
|
dom=[]
|
||||||
|
time_start='%s-%s-01'%(year,str(crr_month).zfill(2))
|
||||||
|
time_stop='%s-%s-%s'%(year,str(crr_month).zfill(2),crr_total_day)
|
||||||
|
dom.append(['resign_date','>=',time_start])
|
||||||
|
dom.append(['resign_date','<=',time_stop])
|
||||||
|
if branch_id:
|
||||||
|
dom.append(['branch_id','=',branch_id])
|
||||||
|
if department_id:
|
||||||
|
dom.append(['department_id','=',department_id])
|
||||||
|
resign_patients_qty=0
|
||||||
|
resign_patients=[]
|
||||||
|
for pt in get_model('clinic.patient').search_browse(dom):
|
||||||
|
resign_patients_qty+=1
|
||||||
|
resign_patients.append(pt.name)
|
||||||
|
|
||||||
|
del dom[-1]
|
||||||
|
dom=replace_quote('%s'%dom)
|
||||||
|
items['topic%s'%count]={
|
||||||
|
'month': month_str,
|
||||||
|
'qty': resign_patients_qty,
|
||||||
|
'action': 'clinic_patient',
|
||||||
|
'action_options': 'mode=list&search_domain=%s&tab_no=2'%dom,
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
# all patient who are in hospital on select month
|
||||||
|
dom=[]
|
||||||
|
weekday, crr_total_day=monthrange(year, crr_month)
|
||||||
|
time_stop='%s-%s-%s'%(year,str(crr_month).zfill(2),crr_total_day)
|
||||||
|
dom.append(['reg_date','<=',time_stop])
|
||||||
|
if branch_id:
|
||||||
|
dom.append(['branch_id','=',branch_id])
|
||||||
|
if department_id:
|
||||||
|
dom.append(['department_id','=',department_id])
|
||||||
|
total_patient=get_model('clinic.patient').search_browse(dom)
|
||||||
|
dom=replace_quote('%s'%dom)
|
||||||
|
total_patient_qty=len(total_patient) or 0
|
||||||
|
items['topic%s'%count]={
|
||||||
|
'month': next_month_str,
|
||||||
|
'qty': total_patient_qty-resign_patients_qty,
|
||||||
|
'action': 'clinic_patient',
|
||||||
|
'action_options': 'mode=list&search_domain=%s'%dom,
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
|
||||||
|
topics=utils.TOPICS
|
||||||
|
for ptype in get_model("clinic.patient.type").search_read([[]],['name']):
|
||||||
|
tkey='topic%s'%count
|
||||||
|
topics.update({
|
||||||
|
tkey:{
|
||||||
|
'name': ptype['name'],
|
||||||
|
'unit': 'คน',
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
dom=[]
|
||||||
|
time_start='%s-%s-01'%(year,str(crr_month).zfill(2))
|
||||||
|
time_stop='%s-%s-%s'%(year,str(crr_month).zfill(2),crr_total_day)
|
||||||
|
dom.append(['reg_date','<=',time_stop])
|
||||||
|
dom.append(['type_id','=',ptype['id']])
|
||||||
|
dom.append(['name','not in', resign_patients])
|
||||||
|
npatients_qty=0
|
||||||
|
for pt in get_model("clinic.patient").search(dom):
|
||||||
|
npatients_qty+=1
|
||||||
|
dom=replace_quote('%s'%dom)
|
||||||
|
items[tkey]={
|
||||||
|
'month': '',
|
||||||
|
'qty': npatients_qty,
|
||||||
|
'action': 'clinic_patient',
|
||||||
|
'action_options': 'mode=list&search_domain=%s'%dom,
|
||||||
|
}
|
||||||
|
count+=1
|
||||||
|
|
||||||
|
lines=[]
|
||||||
|
index=1
|
||||||
|
for item in items:
|
||||||
|
topic='topic%s'%index
|
||||||
|
name=utils.TOPICS[topic]['name']
|
||||||
|
unit=utils.TOPICS[topic]['unit']
|
||||||
|
line=items[topic]
|
||||||
|
line['topic']=name
|
||||||
|
line['unit']=unit
|
||||||
|
lines.append(line)
|
||||||
|
index+=1
|
||||||
|
|
||||||
|
context['defaults']={
|
||||||
|
'date': date,
|
||||||
|
'branch_id': branch_id,
|
||||||
|
'department_id': department_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
medicals=get_model("clinic.report.medical.summary").get_report_data(ids=[],context=context)
|
||||||
|
year=year+543
|
||||||
|
sub_name=''
|
||||||
|
if department_id:
|
||||||
|
dpt=get_model("clinic.department").browse(department_id)
|
||||||
|
sub_name="(%s)" % dpt.name or ""
|
||||||
|
elif branch_id:
|
||||||
|
branch=get_model("clinic.branch").browse(branch_id)
|
||||||
|
sub_name="(%s)" % branch.name or ""
|
||||||
|
data={
|
||||||
|
'branch_id': branch_id,
|
||||||
|
'department_id': department_id,
|
||||||
|
'date': date,
|
||||||
|
'month': month_str,
|
||||||
|
'year': year,
|
||||||
|
'lines': lines,
|
||||||
|
'recent_patients': get_model("clinic.report.recent.patient").get_report_data(ids=[],context=context)['lines'],
|
||||||
|
'resign_patients': get_model("clinic.report.discontinue.patient").get_report_data(ids=[],context=context)['lines'],
|
||||||
|
'medicals': medicals['lines'],
|
||||||
|
'titles': medicals['titles'],
|
||||||
|
'company_name': '%s %s'% (company.name or "", sub_name),
|
||||||
|
'parent_company_name': company.parent_id.name or "",
|
||||||
|
}
|
||||||
|
return data
|
||||||
|
|
||||||
|
HDCasePrint.register()
|
||||||
|
|
@ -172,7 +172,8 @@ class Patient(Model):
|
||||||
return b_ids[0]
|
return b_ids[0]
|
||||||
|
|
||||||
_defaults={
|
_defaults={
|
||||||
"number": _get_number,
|
#"number": _get_number,
|
||||||
|
"number": "",
|
||||||
"reg_date": lambda *a: time.strftime("%Y-%m-%d"),
|
"reg_date": lambda *a: time.strftime("%Y-%m-%d"),
|
||||||
"company_id": lambda *a: get_active_company(),
|
"company_id": lambda *a: get_active_company(),
|
||||||
'branch_id': _get_branch,
|
'branch_id': _get_branch,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import time
|
import time
|
||||||
|
from calendar import monthrange
|
||||||
|
|
||||||
from netforce.model import Model,fields,get_model
|
from netforce.model import Model,fields,get_model
|
||||||
from netforce.access import get_active_company
|
from netforce.access import get_active_company
|
||||||
|
|
|
||||||
|
|
@ -272,5 +272,19 @@ class ReportHDCaseSummary(Model):
|
||||||
data=context['data']
|
data=context['data']
|
||||||
data['department_id']=None
|
data['department_id']=None
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
def get_report_data2(self,context={}):
|
||||||
|
data={}
|
||||||
|
return data
|
||||||
|
|
||||||
|
def run_report(self,ids,context={}):
|
||||||
|
return {
|
||||||
|
'next': {
|
||||||
|
'name': 'clinic_print_hd_case_summary',
|
||||||
|
'refer_id': ids[0],
|
||||||
|
'action_options': 'convert=pdf',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
ReportHDCaseSummary.register()
|
ReportHDCaseSummary.register()
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,56 +1,2 @@
|
||||||
todo:
|
report cycle item :
|
||||||
- multi department access ***
|
- sunanna can not see
|
||||||
- merge staff same name but different department
|
|
||||||
- doctor นายแพทย์ ทวีชัย
|
|
||||||
- tick
|
|
||||||
1. create profile for all department + branch (2)
|
|
||||||
- create sharing setting for all model
|
|
||||||
- branch
|
|
||||||
- deparment
|
|
||||||
- patient
|
|
||||||
- patient cycle
|
|
||||||
- cycle item
|
|
||||||
- visit
|
|
||||||
- hd case
|
|
||||||
- dialyzer
|
|
||||||
- shop
|
|
||||||
- sickbed
|
|
||||||
- staff
|
|
||||||
- staff rotation : only manager nurse
|
|
||||||
- reports
|
|
||||||
- P Moo cycle item -> ok
|
|
||||||
- P อ้วน
|
|
||||||
- claim
|
|
||||||
- not claim
|
|
||||||
- patient
|
|
||||||
- create/ update visit
|
|
||||||
- matching payment
|
|
||||||
- get hn from account setting
|
|
||||||
- new feature HN
|
|
||||||
- split invoice (fee & another)
|
|
||||||
- schedule job
|
|
||||||
- create visit next month
|
|
||||||
|
|
||||||
- run script
|
|
||||||
- update level's nurse -> ok
|
|
||||||
- report k. boy (sub detail) -> ok
|
|
||||||
- ** update accounting
|
|
||||||
- link ref -> ok
|
|
||||||
- bug -> ok
|
|
||||||
- wht (david) -> p yui test
|
|
||||||
|
|
||||||
===============================
|
|
||||||
|
|
||||||
- compute labor cost
|
|
||||||
- update level -> ok
|
|
||||||
- set patient_id with domain state=='admit' -> ok
|
|
||||||
convbal -> not yet (wait yui) -> ok but have to update memo
|
|
||||||
post 10,000 invoices per one time -> ask david
|
|
||||||
patient & staff
|
|
||||||
- split name -> not yet
|
|
||||||
staff have multi department -> added but set have to set permission
|
|
||||||
- many2many
|
|
||||||
show epo(yes) in list of hd case ->ok
|
|
||||||
matching payment > ok
|
|
||||||
create contact from staff -> ok
|
|
||||||
script to clear invoice -> ok
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue