fix: Linters Issue

(cherry picked from commit a103390)

healthcare/healthcare/utils.py

@@ -488,26 +488,11 @@ def get_healthcare_service_item(is_inpatient):
 	return service_item
 
 
-<<<<<<< HEAD
-def get_practitioner_charge(practitioner, is_inpatient):
-	if is_inpatient:
-		practitioner_charge = frappe.db.get_value(
-			"Healthcare Practitioner", practitioner, "inpatient_visit_charge"
-		)
-	else:
-		practitioner_charge = frappe.db.get_value(
-			"Healthcare Practitioner", practitioner, "op_consulting_charge"
-		)
-	if practitioner_charge:
-		return practitioner_charge
-	return False
-=======
 def manage_invoice_validate(doc, method):
 	if doc.service_unit and len(doc.items):
 		for item in doc.items:
 			if not item.service_unit:
 				item.service_unit = doc.service_unit
->>>>>>> 291095d (fix: book Patient Appointment based on check in)
 
 
 def manage_invoice_submit_cancel(doc, method):

healthcare/patches.txt

@@ -2,15 +2,8 @@
 healthcare.patches.v0_0.setup_abdm_custom_fields
 healthcare.patches.v0_0.set_medical_code_from_field_to_codification_table
 healthcare.patches.v15_0.set_fee_validity_status
-<<<<<<< HEAD
-=======
-healthcare.patches.v15_0.create_custom_fields_in_sales_invoice_item
 
 [post_model_sync]
 healthcare.patches.v15_0.rename_field_medical_department_in_appoitment_type_service_item
 healthcare.patches.v15_0.set_default_dynamic_link_dt_for_appointment_type_service_item
-<<<<<<< HEAD
->>>>>>> 291095d (fix: book Patient Appointment based on check in)
-=======
-healthcare.patches.v15_0.set_allow_booking_for_in_appointment_type
->>>>>>> 025117b (fix(patch): Set Allow Booking For in Appointment Type)
+healthcare.patches.v15_0.set_allow_booking_for_in_appointment_type

healthcare/patches/v15_0/set_allow_booking_for_in_appointment_type.py

@@ -4,12 +4,8 @@
 def execute():
 	appointment_types = frappe.db.get_all("Appointment Type")
 	for at in appointment_types:
-		frappe.db.set_value(
-			"Appointment Type", at.name, "allow_booking_for", "Practitioner"
-		)
+		frappe.db.set_value("Appointment Type", at.name, "allow_booking_for", "Practitioner")
 
 	appointment_type_items = frappe.db.get_all("Appointment Type Service Item")
 	for ati in appointment_type_items:
-		frappe.db.set_value(
-			"Appointment Type Service Item", ati.name, "dt", "Medical Department"
-		)
+		frappe.db.set_value("Appointment Type Service Item", ati.name, "dt", "Medical Department")