Healthcare hotfix (#11574)
* Patient dashboard - Vital Signs
* Remove submit validation in Consultation
* Physician Schedule - Add Time Slots - Fix
* Patient Appointment - Client side - fixes
diff --git a/erpnext/healthcare/doctype/consultation/consultation.py b/erpnext/healthcare/doctype/consultation/consultation.py
index e16c221..11b5ed2 100755
--- a/erpnext/healthcare/doctype/consultation/consultation.py
+++ b/erpnext/healthcare/doctype/consultation/consultation.py
@@ -23,10 +23,6 @@
if not self.diagnosis or not self.symptoms:
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):
sales_invoice = frappe.new_doc("Sales Invoice")
sales_invoice.customer = frappe.get_value("Patient", patient, "customer")
diff --git a/erpnext/healthcare/doctype/patient/patient_dashboard.py b/erpnext/healthcare/doctype/patient/patient_dashboard.py
index cb98f0d..f015b83 100644
--- a/erpnext/healthcare/doctype/patient/patient_dashboard.py
+++ b/erpnext/healthcare/doctype/patient/patient_dashboard.py
@@ -11,8 +11,8 @@
'items': ['Patient Appointment', 'Consultation']
},
{
- 'label': _('Lab Tests'),
- 'items': ['Lab Test']
+ 'label': _('Lab Tests and Vital Signs'),
+ 'items': ['Lab Test', 'Vital Signs']
}
]
}
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index 1942b66..2237ff5 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -25,6 +25,14 @@
frm.add_custom_button(__('Cancel'), function() {
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){
frm.add_custom_button(__('Cancel'), function() {
diff --git a/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js b/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
index e198d35..74ba66f 100644
--- a/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
+++ b/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
@@ -33,7 +33,7 @@
while(cur_time < end_time) {
let to_time = cur_time.clone().add(values.duration, 'minutes');
- if(to_time < end_time) {
+ if(to_time <= end_time) {
// add a new timeslot
frm.add_child('time_slots', {