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

Healthcare hotfix (#11574)

Browse Source 
* Patient dashboard - Vital Signs

* Remove submit validation in Consultation

* Physician Schedule - Add Time Slots - Fix

* Patient Appointment - Client side - fixes
This commit is contained in:
Jamsheer 2017-11-15 09:47:00 +05:30 committed by Nabin Hait
parent 43edd5d03c
commit bab226698f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/healthcare/doctype/consultation/consultation.py
View File

@ -23,10 +23,6 @@ class Consultation(Document):
if not self.diagnosis or not self.symptoms: if not self.diagnosis or not self.symptoms:
frappe.throw("Diagnosis and Complaints cannot be left blank") frappe.throw("Diagnosis and Complaints cannot be left blank")
physician = frappe.get_doc("Physician",self.physician)
if(frappe.session.user != physician.user_id):
frappe.throw(_("You don't have permission to submit"))
def set_sales_invoice_fields(company, patient): def set_sales_invoice_fields(company, patient):
sales_invoice = frappe.new_doc("Sales Invoice") sales_invoice = frappe.new_doc("Sales Invoice")
sales_invoice.customer = frappe.get_value("Patient", patient, "customer") sales_invoice.customer = frappe.get_value("Patient", patient, "customer")

4
erpnext/healthcare/doctype/patient/patient_dashboard.py
View File

@ -11,8 +11,8 @@ def get_data():
'items': ['Patient Appointment', 'Consultation'] 'items': ['Patient Appointment', 'Consultation']
}, },
{ {
'label': _('Lab Tests'), 'label': _('Lab Tests and Vital Signs'),
'items': ['Lab Test'] 'items': ['Lab Test', 'Vital Signs']
} }
] ]
} }

8
erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
View File

@ -25,6 +25,14 @@ frappe.ui.form.on('Patient Appointment', {
frm.add_custom_button(__('Cancel'), function() { frm.add_custom_button(__('Cancel'), function() {
btn_update_status(frm, "Cancelled"); btn_update_status(frm, "Cancelled");
}); });
frm.add_custom_button(__("Consultation"),function(){
btn_create_consultation(frm);
},"Create");
frm.add_custom_button(__('Vital Signs'), function() {
btn_create_vital_signs(frm);
},"Create");
} }
if(frm.doc.status == "Scheduled" && !frm.doc.__islocal){ if(frm.doc.status == "Scheduled" && !frm.doc.__islocal){
frm.add_custom_button(__('Cancel'), function() { frm.add_custom_button(__('Cancel'), function() {

2
erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
View File

@ -33,7 +33,7 @@ frappe.ui.form.on('Physician Schedule', {
while(cur_time < end_time) { while(cur_time < end_time) {
let to_time = cur_time.clone().add(values.duration, 'minutes'); let to_time = cur_time.clone().add(values.duration, 'minutes');
if(to_time < end_time) { if(to_time <= end_time) {
// add a new timeslot // add a new timeslot
frm.add_child('time_slots', { frm.add_child('time_slots', {