EA-195 - ADT inpatient requests should be fulfilled by any ADT encoun…

…ter (#243)
openmrs · Sep 6, 2024 · 3c6d21b · 3c6d21b
1 parent 2d89e88
commit 3c6d21b
Showing 1 changed file with 3 additions and 9 deletions.
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
@@ -954,15 +954,9 @@ public List<InpatientRequest> getInpatientRequests(InpatientRequestSearchCriteri
 
  // Get all encounter types that might cause a request to be fulfilled
  List<EncounterType> 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<String> dispositionLocationIds = null;