diff --git a/api/src/main/java/org/openmrs/module/emrapi/adt/AdtServiceImpl.java b/api/src/main/java/org/openmrs/module/emrapi/adt/AdtServiceImpl.java index 6140c32f..1dc73e74 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/adt/AdtServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/emrapi/adt/AdtServiceImpl.java @@ -954,15 +954,9 @@ public List getInpatientRequests(InpatientRequestSearchCriteri // Get all encounter types that might cause a request to be fulfilled List adtEncounterTypes = new ArrayList<>(); - if (dispositionTypes.contains(DispositionType.ADMIT)) { - adtEncounterTypes.add(emrApiProperties.getAdmissionEncounterType()); - } - if (dispositionTypes.contains(DispositionType.TRANSFER)) { - adtEncounterTypes.add(emrApiProperties.getTransferWithinHospitalEncounterType()); - } - if (dispositionTypes.contains(DispositionType.DISCHARGE)) { - adtEncounterTypes.add(emrApiProperties.getExitFromInpatientEncounterType()); - } + adtEncounterTypes.add(emrApiProperties.getAdmissionEncounterType()); + adtEncounterTypes.add(emrApiProperties.getTransferWithinHospitalEncounterType()); + adtEncounterTypes.add(emrApiProperties.getExitFromInpatientEncounterType()); // Disposition Locations are stored as Obs where the valueText is the location id. Collect these values List dispositionLocationIds = null;