From 3c6d21bd52bd81b26527f66e6ea99390861ec560 Mon Sep 17 00:00:00 2001
From: Michael Seaton <mseaton@pih.org>
Date: Fri, 6 Sep 2024 14:49:08 -0400
Subject: [PATCH] EA-195 - ADT inpatient requests should be fulfilled by any
 ADT encounter (#243)

---
 .../openmrs/module/emrapi/adt/AdtServiceImpl.java    | 12 +++---------
 1 file changed, 3 insertions(+), 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
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<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;