diff --git a/api/src/test/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAOIntegrationTest.java b/api/src/test/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAOIntegrationTest.java
index 231d5b2..e815391 100644
--- a/api/src/test/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAOIntegrationTest.java
+++ b/api/src/test/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAOIntegrationTest.java
@@ -285,12 +285,12 @@ public void shouldGetTheSavedSlotsForPatientByAdministeredTime() {
MedicationAdministration medicationAdministration=new MedicationAdministration();
- medicationAdministration.setStatus(testConcept);
+ medicationAdministration.setStatus(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.COMPLETED);
medicationAdministration.setAdministeredDateTime(DateTimeUtil.convertLocalDateTimeDate(medicationAdministeredTime));
MedicationAdministration savedMedicationAdministration= medicationAdministrationDao.createOrUpdate(medicationAdministration);
MedicationAdministration medicationAdministration2=new MedicationAdministration();
- medicationAdministration2.setStatus(testConcept);
+ medicationAdministration2.setStatus(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.COMPLETED);
medicationAdministration2.setAdministeredDateTime(DateTimeUtil.convertLocalDateTimeDate(medicationAdministeredTime2));
MedicationAdministration savedMedicationAdministration2= medicationAdministrationDao.createOrUpdate(medicationAdministration2);
@@ -376,12 +376,12 @@ public void shouldGetTheSavedSlotsForPatientBySubjectReferenceAndAGivenTimeFrame
MedicationAdministration medicationAdministration=new MedicationAdministration();
- medicationAdministration.setStatus(testConcept);
+ medicationAdministration.setStatus(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.COMPLETED);
medicationAdministration.setAdministeredDateTime(DateTimeUtil.convertLocalDateTimeDate(medicationAdministeredTime));
MedicationAdministration savedMedicationAdministration= medicationAdministrationDao.createOrUpdate(medicationAdministration);
MedicationAdministration medicationAdministration2=new MedicationAdministration();
- medicationAdministration2.setStatus(testConcept);
+ medicationAdministration2.setStatus(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.COMPLETED);
medicationAdministration2.setAdministeredDateTime(DateTimeUtil.convertLocalDateTimeDate(medicationAdministeredTime2));
MedicationAdministration savedMedicationAdministration2= medicationAdministrationDao.createOrUpdate(medicationAdministration2);
diff --git a/api/src/test/resources/scheduleMedicationsTestData.xml b/api/src/test/resources/scheduleMedicationsTestData.xml
index 920b1d3..f43448c 100644
--- a/api/src/test/resources/scheduleMedicationsTestData.xml
+++ b/api/src/test/resources/scheduleMedicationsTestData.xml
@@ -29,8 +29,8 @@
-
-
+
+
diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java
index 4857b4e..856a047 100644
--- a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java
+++ b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java
@@ -38,7 +38,7 @@ public static MedicationAdministrationResponse createFrom(org.openmrs.module.ipd
if (openmrsMedicationAdministration == null) {
return null;
}
- String status = openmrsMedicationAdministration.getStatus() != null ? openmrsMedicationAdministration.getStatus().getShortNameInLocale(Context.getLocale()).getName() : null;
+ String status = openmrsMedicationAdministration.getStatus().toCode() != null ? openmrsMedicationAdministration.getStatus().toCode() : null;
String statusReason = openmrsMedicationAdministration.getStatusReason() != null ? openmrsMedicationAdministration.getStatusReason().getDisplayString() : null;
String patientUuid = openmrsMedicationAdministration.getPatient() != null ? openmrsMedicationAdministration.getPatient().getUuid() : null;
String encounterUuid = openmrsMedicationAdministration.getEncounter() != null ? openmrsMedicationAdministration.getEncounter().getUuid() : null;
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 ef626fc..8caa639 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
@@ -13,6 +13,8 @@
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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
@@ -30,6 +32,7 @@ public class IPDMedicationAdministrationController extends BaseRestController {
private final IPDMedicationAdministrationService ipdMedicationAdministrationService;
private final MedicationAdministrationFactory medicationAdministrationFactory;
+ private static final Logger log = LoggerFactory.getLogger(IPDMedicationAdministrationController.class);
@Autowired
public IPDMedicationAdministrationController(IPDMedicationAdministrationService ipdMedicationAdministrationService,
diff --git a/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java b/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java
index 7573ac6..06bb312 100644
--- a/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java
+++ b/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java
@@ -2,7 +2,6 @@
import org.openmrs.DrugOrder;
import org.openmrs.api.context.Context;
-import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationStatusTranslator;
import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationTranslator;
import org.openmrs.module.ipd.api.model.MedicationAdministration;
import org.openmrs.module.ipd.api.model.MedicationAdministrationNote;
@@ -12,7 +11,6 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -21,13 +19,10 @@
public class MedicationAdministrationFactory {
private MedicationAdministrationTranslator medicationAdministrationTranslator;
- private MedicationAdministrationStatusTranslator medicationAdministrationStatusTranslator;
@Autowired
- public MedicationAdministrationFactory(MedicationAdministrationTranslator medicationAdministrationTranslator,
- MedicationAdministrationStatusTranslator medicationAdministrationStatusTranslator) {
+ public MedicationAdministrationFactory(MedicationAdministrationTranslator medicationAdministrationTranslator) {
this.medicationAdministrationTranslator = medicationAdministrationTranslator;
- this.medicationAdministrationStatusTranslator = medicationAdministrationStatusTranslator;
}
public MedicationAdministration mapRequestToMedicationAdministration(MedicationAdministrationRequest request, MedicationAdministration existingMedicationAdministration) {
@@ -35,7 +30,7 @@ public MedicationAdministration mapRequestToMedicationAdministration(MedicationA
MedicationAdministration medicationAdministration = new MedicationAdministration();
if (existingMedicationAdministration ==null || existingMedicationAdministration.getId() == null) {
medicationAdministration.setAdministeredDateTime(request.getAdministeredDateTimeAsLocaltime());
- medicationAdministration.setStatus(medicationAdministrationStatusTranslator.toOpenmrsType(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.fromCode(request.getStatus())));
+ medicationAdministration.setStatus(org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationStatus.fromCode(request.getStatus()));
medicationAdministration.setPatient(Context.getPatientService().getPatientByUuid(request.getPatientUuid()));
medicationAdministration.setEncounter(Context.getEncounterService().getEncounterByUuid(request.getEncounterUuid()));
medicationAdministration.setDrugOrder((DrugOrder) Context.getOrderService().getOrderByUuid(request.getOrderUuid()));