Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EA-210 Add encounter types for cancelling ADT request and for bed ass… #253

Merged
merged 1 commit into from
Nov 7, 2024
Merged

EA-210 Add encounter types for cancelling ADT request and for bed ass… #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/src/main/java/org/openmrs/module/emrapi/EmrApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public class EmrApiConstants {

public static final String GP_TRANSFER_REQUEST_ENCOUNTER_TYPE = "emr.transferRequestEncounterType";

public static final String GP_BED_ASSIGNMENT_ENCOUNTER_TYPE = "emr.bedAssignmentEncounterType";

public static final String GP_CANCEL_ADT_REQUEST_ENCOUNTER_TYPE = "emr.cancelADTRequestEncounterType";

public static final String GP_CHECK_IN_CLERK_ENCOUNTER_ROLE = "emr.checkInClerkEncounterRole";

public static final String GP_CLINICIAN_ENCOUNTER_ROLE = "emr.clinicianEncounterRole";
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/emrapi/EmrApiProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ public EncounterType getTransferRequestEncounterType() {
return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_TRANSFER_REQUEST_ENCOUNTER_TYPE, false);
}

public EncounterType getBedAssignmentEncounterType() {
return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_BED_ASSIGNMENT_ENCOUNTER_TYPE, false);
}

public EncounterType getCancelADTRequestEncounterType() {
return getEmrApiMetadataByCode(EncounterType.class, EmrApiConstants.GP_CANCEL_ADT_REQUEST_ENCOUNTER_TYPE, false);
}

public Form getAdmissionForm() {
return getEmrApiMetadataByCode(Form.class, EmrApiConstants.GP_ADMISSION_FORM, false);
}
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void shouldGetAsJson() throws Exception {
@Test
public void shouldGetDefaultRepresentation() {
SimpleObject config = emrApiConfigurationController.getEmrApiConfiguration(request, response);
assertEquals(51, config.keySet().size());
assertEquals(53, config.keySet().size());
assertEquals("org.openmrs.module.emrapi", config.get("metadataSourceName"));
assertEquals("50", config.get("lastViewedPatientSizeLimit").toString());
Map<String, Object> unknownLocation = mapNode(config, "unknownLocation");
Expand Down
Loading