diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
index eab36ae..d1f72d6 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
@@ -14,7 +14,7 @@
 		if (!frm.doc.__islocal) {
 			frm.trigger('show_progress_for_therapies');
 			if (frm.doc.status != 'Completed') {
-				let therapy_types = (frm.doc.therapy_plan_details || []).map(function(d){ return d.therapy_type });
+				let therapy_types = (frm.doc.therapy_plan_details || []).map(function(d){ return d.therapy_type; });
 				const fields = [{
 					fieldtype: 'Link',
 					label: __('Therapy Type'),
@@ -24,7 +24,7 @@
 					get_query: function() {
 						return {
 							filters: { 'therapy_type': ['in', therapy_types]}
-						}
+						};
 					}
 				}];
 
diff --git a/erpnext/healthcare/doctype/therapy_session/therapy_session.js b/erpnext/healthcare/doctype/therapy_session/therapy_session.js
index 5f35ceb..a2b01c9 100644
--- a/erpnext/healthcare/doctype/therapy_session/therapy_session.js
+++ b/erpnext/healthcare/doctype/therapy_session/therapy_session.js
@@ -46,7 +46,7 @@
 						frappe.model.open_mapped_doc({
 							method: 'erpnext.healthcare.doctype.therapy_session.therapy_session.invoice_therapy_session',
 							frm: frm,
-						})
+						});
 					}, 'Create');
 				}
 			});
@@ -67,7 +67,7 @@
 				name: frm.doc.therapy_plan
 			},
 			callback: function(data) {
-				let therapy_types = (data.message.therapy_plan_details || []).map(function(d){ return d.therapy_type });
+				let therapy_types = (data.message.therapy_plan_details || []).map(function(d){ return d.therapy_type; });
 				frm.set_query('therapy_type', function() {
 					return {
 						filters: { 'therapy_type': ['in', therapy_types]}
