Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

add branch

conv_bal
watcha.h@almacom.co.th 2015-01-14 18:00:14 +07:00
parent 35ca91bde5
commit d1a45db132
18 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netforce_clinic/layouts/clinic_branch_form.xml
View File

@ -1,5 +1,5 @@
<form model="clinic.branch" show_company="1">
<field name="name"/>
<field name="parent_id"/>
<field name="company_id" invisible="1"/>
<field name="company_id"/>
</form>

1
netforce_clinic/layouts/clinic_branch_list.xml
View File

@ -1,4 +1,5 @@
<list model="clinic.branch">
<field name="name"/>
<field name="parent_id"/>
<field name="company_id"/>
</list>

2
netforce_clinic/layouts/clinic_cycle_form.xml
View File

@ -10,7 +10,7 @@
<field name="color"/>
<field name="duration"/>
<field name="note"/>
<field name="company_id" invisible="1"/>
<!--<field name="company_id" invisible="1"/>-->
<related>
<field name="cycle_items"/>
<field name="visits"/>

1
netforce_clinic/layouts/clinic_hd_case_form.xml
View File

@ -15,6 +15,7 @@
<field name="department_id" span="2"/>
<field name="cycle_item_id" span="2" domain="[['cycle_id','=',cycle_id]]"/>
<field name="visit_id" span="2"/>
<field name="branch_id" span="2"/>
<field name="req_fee" span="2" invisible="1"/>
<field name="company_id" span="2" invisible="1"/> <!-- to show company name, don't remove -->
<field name="hct_include" span="2" invisible="1"/>

2
netforce_clinic/layouts/clinic_menu.xml
View File

@ -51,7 +51,7 @@
<item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
</item>
<item string="Settings" perm="clinic_settings">
<!--<item string="Branches" action="clinic_branch"/>-->
<item string="Branches" action="clinic_branch"/>
<item string="Departments" action="clinic_department"/>
<item string="Hospitals" action="clinic_hospital"/>
<item string="Nationalities" action="clinic_nation"/>

1
netforce_clinic/layouts/clinic_patient_form.xml
View File

@ -17,6 +17,7 @@
<field name="categ_id"/>
<field name="doctor_id"/>
<field name="department_id"/>
<field name="branch_id"/>
<tabs>
<tab string="General Information">
<group span="6" columns="1">

2
netforce_clinic/layouts/clinic_patient_list.xml
View File

@ -6,7 +6,7 @@
<field name="number"/>
<field name="trt_no"/>
<field name="name"/>
<field name="company_id"/>
<field name="branch_id"/>
<field name="department_id"/>
<field name="categ_id"/>
<field name="type_id"/>

1
netforce_clinic/layouts/clinic_sickbed_form.xml
View File

@ -8,6 +8,7 @@
<field name="name"/>
<field name="available"/>
<field name="sequence"/>
<field name="branch_id"/>
<field name="note"/>
<field name="company_id" invisible="1"/>
<related>

3
netforce_clinic/layouts/clinic_staff_form.xml
View File

@ -11,6 +11,7 @@
<field name="name_eng"/>
<field name="nick_name"/>
<field name="department_id"/>
<field name="company_id" invisible="1"/>
<tabs>
<tab string="General">
<group span="6" columns="1">
@ -21,7 +22,7 @@
<field name="nation_id"/>
<field name="categ_id" domain="[['type','=',type]]"/>
<field name="state"/>
<field name="company_id"/>
<field name="branch_id"/>
</group>
<group span="6" columns="1">
<field name="image"/>

2
netforce_clinic/layouts/clinic_staff_list.xml
View File

@ -9,7 +9,7 @@
</top>
<field name="number"/>
<field name="name"/>
<field name="company_id"/>
<field name="branch_id"/>
<field name="department_id"/>
<field name="level_id"/>
<field name="categ_id"/>

1
netforce_clinic/layouts/clinic_visit_form.xml
View File

@ -15,6 +15,7 @@
<field name="time_start" onchange="onchange_datefrom"/>
<field name="cycle_id" onchange="onchange_cycle" required="1"/>
<field name="department_id"/>
<field name="branch_id"/>
</group>
<group span="6" columns="1">
<field name="patient_id" onchange="onchange_patient"/>

2
netforce_clinic/models/cycle.py
View File

@ -7,7 +7,7 @@ class Cycle(Model):
_name="clinic.cycle"
_string="Cycle"
_key=["name"]
_multi_company=True
#_multi_company=True
def _get_duration(self,ids,context={}):
res={}

3
netforce_clinic/models/hd_case.py
View File

@ -125,6 +125,7 @@ class HDCase(Model):
'req_fee': fields.Integer("Request Expense"),
'hd_case_id': fields.Many2One("clinic.hd.case","HD",function="_get_all",function_multi=True), # XXX
'company_id': fields.Many2One("company","Company"),
'branch_id': fields.Many2One("clinic.branch","Branch"),
}
def _get_number(self,context={}):
@ -209,6 +210,7 @@ class HDCase(Model):
if patient_id:
patient=get_model('clinic.patient').browse(patient_id)
department=patient.department_id
branch=patient.branch_id
cycle=patient.cycle_id
partner=patient.type_id.contact_id
if partner:
@ -216,6 +218,7 @@ class HDCase(Model):
else:
data['fee_partner_id']=None
data['department_id']=department.id
data['branch_id']=branch.id
data['cycle_id']=cycle.id
data['patient_type_id']=patient.type_id.id
if patient.type_id.hct_include:

1
netforce_clinic/models/patient.py
View File

@ -100,6 +100,7 @@ class Patient(Model):
'rm_remain_visit': fields.Boolean("Auto Remove Remaining Visit"),
'department_id': fields.Many2One("clinic.department","Department"),
'cycle_id': fields.Many2One("clinic.cycle","Last Cycle",function="_get_last_cycle"),
'branch_id': fields.Many2One("clinic.branch","Branch"),
}
def _get_number(self,context={}):

14
netforce_clinic/models/sickbed.py
View File

@ -1,5 +1,5 @@
from netforce.model import Model, fields, get_model
from netforce.access import get_active_company
from netforce.access import get_active_company, get_active_user
class SickBed(Model):
_name="clinic.sickbed"
@ -35,13 +35,25 @@ class SickBed(Model):
"state": fields.Selection([("available","Available"),("not_available","Not Available")],"Status"),
'sequence': fields.Integer("Sequence"),
'note': fields.Text("Note"),
'branch_id': fields.Many2One("clinic.branch","Branch",required=True, search=True),
}
def _get_sickbed(self,context={}):
user_id=get_active_user()
staffs=get_model("clinic.staff").search_browse([['user_id','=',user_id]])
branch_id=None
if staffs:
staff=staffs[0]
if staff.branch_id:
branch_id=staff.branch_id.id
return branch_id
_defaults={
'available': True,
"company_id": lambda *a: get_active_company(),
'sequence': 0,
'state': 'available',
'branch_id': _get_sickbed,
}
_order="sequence"

1
netforce_clinic/models/staff.py
View File

@ -116,6 +116,7 @@ class Staff(Model):
"hd_case_staffs": fields.One2Many("clinic.hd.case.staff","staff_id","HD Cases"),
"hd_cases": fields.Many2Many("clinic.hd.case","HD Cases",function="_get_hdcase"), # not need to use (it's slow to load)
"cycle_item_nurses": fields.One2Many("clinic.cycle.item.nurse","nurse_id","Cycle Items"),
'branch_id': fields.Many2One("clinic.branch","Branch"),
}
def _get_number(self,context={}):

11
netforce_clinic/models/visit.py
View File

@ -51,6 +51,7 @@ class Visit(Model):
'visit_date': fields.Date('Visit Date'),
'cycle_color': fields.Char('Color',function="_get_all",function_multi=True,store=True),
'note': fields.Text('Note'),
'branch_id': fields.Many2One("clinic.branch","Branch"),
}
def _get_number(self,context={}):
@ -163,6 +164,7 @@ class Visit(Model):
'time_stop': obj.time_stop,
'cycle_id' : obj.cycle_id.id,
'visit_id': obj.id,
'branch_id': obj.branch_id.id,
'lines':[],
'dialyzers': [],
'staffs': [],
@ -279,8 +281,15 @@ class Visit(Model):
elif patient.department_id:
department_id=patient.department_id.id
branch_id=None
if visit.branch_id:
branch_id=visit.branch_id.id
elif patient.branch_id:
branch_id=patient.branch_id.id
print("branch_id ", branch_id)
data['doctor_id']=doctor.id
data['department_id']=department_id
data['branch_id']=branch_id
if not patient.doctor_id:
patient.write({
@ -289,8 +298,10 @@ class Visit(Model):
else:
doctor=patient.doctor_id
department=patient.department_id
branch=patient.branch_id
data['doctor_id']=doctor.id
data['department_id']=department.id
data['branch_id']=branch.id
return data

11
netforce_clinic/todo.txt
View File

@ -1 +1,10 @@
onclick hd case on staff
sharing setting
- filter by branch
- patient
- staff
- visit
- hd case
- cycle item
- sickbed
- add popup to new dialyser
- running number