diff --git a/api/src/main/java/org/openmrs/module/ipd/api/util/PrivilegeConstants.java b/api/src/main/java/org/openmrs/module/ipd/api/util/PrivilegeConstants.java
deleted file mode 100644
index ede0449..0000000
--- a/api/src/main/java/org/openmrs/module/ipd/api/util/PrivilegeConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openmrs.module.ipd.api.util;
-
-import org.openmrs.annotation.AddOnStartup;
-
-public class PrivilegeConstants {
-
- @AddOnStartup(description = "Able to save ipd schedules")
- public static final String EDIT_IPD_SCHEDULES = "Edit IPD Schedules";
-
- @AddOnStartup(description = "Able to save ipd slots")
- public static final String EDIT_IPD_SLOTS = "Edit IPD Slots";
-
-}
diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
index 648ac33..df5fc2f 100644
--- a/api/src/main/resources/liquibase.xml
+++ b/api/src/main/resources/liquibase.xml
@@ -467,5 +467,64 @@
'2024-04-11 19:00:00', 'MM/dd/yyyy HH:mm:ss', 86400, true, 1, NOW(), UUID());
-
+
+
+ select count(*) from privilege where privilege = 'Edit Medication Tasks'
+
+
+
+
+
+
+
+
+
+ select count(*) from privilege where privilege = 'Delete Medication Tasks'
+
+
+
+
+
+
+
+
+
+ select count(*) from privilege where privilege = 'Edit adhoc medication tasks'
+
+
+
+
+
+
+
+
+
+ select count(*) from privilege where privilege = 'Edit Medication Administration'
+
+
+
+
+
+
+
+
+
+ select count(*) from privilege where privilege = 'Get Medication Administration'
+
+
+
+
+
+
+
+
+
+ select count(*) from privilege where privilege = 'Get Medication Tasks'
+
+
+
+
+
+
+
diff --git a/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java b/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java
index 2e8f9d6..d22cd8a 100644
--- a/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java
+++ b/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java
@@ -2,12 +2,14 @@
import lombok.extern.slf4j.Slf4j;
import org.hl7.fhir.r4.model.MedicationAdministration;
+import org.openmrs.api.context.Context;
import org.openmrs.module.fhir2.apiext.dao.FhirMedicationAdministrationDao;
import org.openmrs.module.ipd.api.service.SlotService;
import org.openmrs.module.ipd.contract.MedicationAdministrationRequest;
import org.openmrs.module.ipd.contract.MedicationAdministrationResponse;
import org.openmrs.module.ipd.factory.MedicationAdministrationFactory;
import org.openmrs.module.ipd.service.IPDMedicationAdministrationService;
+import org.openmrs.module.ipd.util.PrivilegeConstants;
import org.openmrs.module.webservices.rest.web.RestConstants;
import org.openmrs.module.webservices.rest.web.RestUtil;
import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController;
@@ -19,8 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.HttpStatus.*;
@Controller
@RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/ipd")
@@ -43,6 +44,9 @@ public IPDMedicationAdministrationController(IPDMedicationAdministrationService
@ResponseBody
public ResponseEntity