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

Merge pull request #23799 from ruchamahabal/fix-ipme

Browse Source 
fix: Inpatient Medication Order and Entry fixes
This commit is contained in:
Rucha Mahabal 2020-11-03 15:43:06 +05:30 committed by GitHub
commit b7e84f70c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
View File

@ -21,6 +21,19 @@ frappe.ui.form.on('Inpatient Medication Entry', {
}
};
});
frm.set_query('warehouse', () => {
return {
filters: {
company: frm.doc.company
}
};
});
},
patient: function(frm) {
if (frm.doc.patient)
frm.set_value('service_unit', '');
},
get_medication_orders: function(frm) {

4
erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
View File

@ -67,6 +67,7 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "eval: doc.__islocal",
"fieldname": "filters_section",
"fieldtype": "Section Break",
"label": "Filters"
@ -93,6 +94,7 @@
"options": "Patient"
},
{
"depends_on": "eval:!doc.patient",
"fieldname": "service_unit",
"fieldtype": "Link",
"label": "Healthcare Service Unit",
@ -178,7 +180,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2020-09-30 23:40:45.528715",
"modified": "2020-11-03 13:22:37.820707",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Inpatient Medication Entry",

6
erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
View File

@ -199,6 +199,7 @@ class InpatientMedicationEntry(Document):
def get_pending_medication_orders(entry):
filters, values = get_filters(entry)
to_remove = []
data = frappe.db.sql("""
SELECT
@ -225,7 +226,10 @@ def get_pending_medication_orders(entry):
doc['service_unit'] = get_current_healthcare_service_unit(inpatient_record)
if entry.service_unit and doc.service_unit != entry.service_unit:
data.remove(doc)
to_remove.append(doc)
for doc in to_remove:
data.remove(doc)
return data

3
erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.js
View File

@ -12,7 +12,8 @@ frappe.ui.form.on('Inpatient Medication Order', {
frm.set_query('patient', () => {
return {
filters: {
'inpatient_record': ['!=', '']
'inpatient_record': ['!=', ''],
'inpatient_status': 'Admitted'
}
};
});