Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: company when creatign procedure, practitioner name added

Browse Source
This commit is contained in:
anoop 2020-04-13 12:11:59 +05:30
parent b514b26242
commit db00dbf90e
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
View File

@ -110,7 +110,8 @@ frappe.ui.form.on('Patient Encounter', {
'patient':data.message.patient, 'patient':data.message.patient,
'type': data.message.appointment_type, 'type': data.message.appointment_type,
'practitioner': data.message.practitioner, 'practitioner': data.message.practitioner,
'invoiced': data.message.invoiced 'invoiced': data.message.invoiced,
'company': data.message.company
}; };
frm.set_value(values); frm.set_value(values);
} }
@ -209,7 +210,8 @@ let create_vital_signs = function (frm) {
frappe.route_options = { frappe.route_options = {
'patient': frm.doc.patient, 'patient': frm.doc.patient,
'appointment': frm.doc.appointment, 'appointment': frm.doc.appointment,
'encounter': frm.doc.name 'encounter': frm.doc.name,
'company': frm.doc.company
}; };
frappe.new_doc('Vital Signs'); frappe.new_doc('Vital Signs');
}; };
@ -220,7 +222,8 @@ let create_procedure = function (frm) {
} }
frappe.route_options = { frappe.route_options = {
'patient': frm.doc.patient, 'patient': frm.doc.patient,
'medical_department': frm.doc.medical_department 'medical_department': frm.doc.medical_department,
'company': frm.doc.company
}; };
frappe.new_doc('Clinical Procedure'); frappe.new_doc('Clinical Procedure');
}; };

24
erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
View File

@ -17,9 +17,9 @@
"patient_name", "patient_name",
"patient_sex", "patient_sex",
"patient_age", "patient_age",
"company",
"column_break_6", "column_break_6",
"practitioner", "practitioner",
"practitioner_name",
"medical_department", "medical_department",
"encounter_date", "encounter_date",
"encounter_time", "encounter_time",
@ -43,6 +43,8 @@
"sb_procedures", "sb_procedures",
"procedure_prescription", "procedure_prescription",
"encounter_comment", "encounter_comment",
"sb_refs",
"company",
"amended_from" "amended_from"
], ],
"fields": [ "fields": [
@ -80,7 +82,6 @@
"fieldname": "patient", "fieldname": "patient",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
"in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Patient", "label": "Patient",
"options": "Patient", "options": "Patient",
@ -110,7 +111,6 @@
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1,
"label": "Company", "label": "Company",
"options": "Company" "options": "Company"
}, },
@ -121,7 +121,6 @@
{ {
"fieldname": "practitioner", "fieldname": "practitioner",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Healthcare Practitioner", "label": "Healthcare Practitioner",
"options": "Healthcare Practitioner", "options": "Healthcare Practitioner",
@ -272,7 +271,6 @@
"fieldname": "medical_department", "fieldname": "medical_department",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
"in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Department", "label": "Department",
"options": "Medical Department", "options": "Medical Department",
@ -287,11 +285,23 @@
{ {
"fieldname": "column_break_17", "fieldname": "column_break_17",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "sb_refs",
"fieldtype": "Section Break"
},
{
"fetch_from": "practitioner.practitioner_name",
"fieldname": "practitioner_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Practitioner Name",
"read_only": 1
} }
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-02-27 12:42:21.751964", "modified": "2020-04-03 23:06:16.348846",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Patient Encounter", "name": "Patient Encounter",
@ -318,7 +328,7 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "patient", "title_field": "patient_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }