diff --git a/api/src/main/java/org/openmrs/module/emrapi/EmrApiConstants.java b/api/src/main/java/org/openmrs/module/emrapi/EmrApiConstants.java index 31635469..b2a9f5a4 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/EmrApiConstants.java +++ b/api/src/main/java/org/openmrs/module/emrapi/EmrApiConstants.java @@ -44,6 +44,10 @@ public class EmrApiConstants { public static final String GP_TRANSFER_WITHIN_HOSPITAL_ENCOUNTER_TYPE = "emr.transferWithinHospitalEncounterType"; + public static final String GP_INPATIENT_NOTE_ENCOUNTER_TYPE = "emr.inpatientNoteEncounterType"; + + public static final String GP_TRANSFER_REQUEST_ENCOUNTER_TYPE = "emr.transferRequestEncounterType"; + public static final String GP_CHECK_IN_CLERK_ENCOUNTER_ROLE = "emr.checkInClerkEncounterRole"; public static final String GP_CLINICIAN_ENCOUNTER_ROLE = "emr.clinicianEncounterRole"; diff --git a/api/src/main/java/org/openmrs/module/emrapi/EmrApiProperties.java b/api/src/main/java/org/openmrs/module/emrapi/EmrApiProperties.java index 585aefe7..2141a8cf 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/EmrApiProperties.java +++ b/api/src/main/java/org/openmrs/module/emrapi/EmrApiProperties.java @@ -121,6 +121,14 @@ public EncounterType getTransferWithinHospitalEncounterType() { return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_TRANSFER_WITHIN_HOSPITAL_ENCOUNTER_TYPE, false); } + public EncounterType getInpatientNoteEncounterType() { + return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_INPATIENT_NOTE_ENCOUNTER_TYPE, false); + } + + public EncounterType getTransferRequestEncounterType() { + return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_TRANSFER_REQUEST_ENCOUNTER_TYPE, false); + } + public Form getAdmissionForm() { return getEmrApiMetadataByCode(Form.class, EmrApiConstants.GP_ADMISSION_FORM, false); } diff --git a/omod/src/test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java b/omod/src/test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java index d3d6f916..c357dfe1 100644 --- a/omod/src/test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java +++ b/omod/src/test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java @@ -66,7 +66,7 @@ public void shouldGetAsJson() throws Exception { @Test public void shouldGetDefaultRepresentation() { SimpleObject config = emrApiConfigurationController.getEmrApiConfiguration(request, response); - assertEquals(48, config.keySet().size()); + assertEquals(50, config.keySet().size()); assertEquals("org.openmrs.module.emrapi", config.get("metadataSourceName")); assertEquals("50", config.get("lastViewedPatientSizeLimit").toString()); Map unknownLocation = mapNode(config, "unknownLocation");