Correctly filter to only send orders if SCC is selected

IsantePlus · Jul 25, 2024 · e3da001 · e3da001
1 parent 0192f7d
commit e3da001
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/labintegration/api/impl/LabIntegrationServiceImpl.java b/api/src/main/java/org/openmrs/module/labintegration/api/impl/LabIntegrationServiceImpl.java
@@ -35,7 +35,7 @@ public void doOrder(Encounter encounter) throws NewOrderException {
 				StringUtils.join(orderDestinations, ','));
 
 		for (OrderDestination destination : orderDestinations) {
-			if (!destination.equals(OrderDestination.SCC)) {
+			if (destination.equals(OrderDestination.SCC)) {
 				orderSenderManager.sendOrders(encounter, destination);
 			} else {
 				LOGGER.info("Skipping order not bound for SCC");

diff --git a/api/src/main/java/org/openmrs/module/labintegration/api/model/OrderDestination.java b/api/src/main/java/org/openmrs/module/labintegration/api/model/OrderDestination.java
@@ -37,7 +37,10 @@ public static List<OrderDestination> getOrderDestinations(Encounter encounter) {
 
         for (Obs obs : encounter.getAllObs()) {
             if (ObjectUtils.equals(obs.getConcept().getUuid(), ORDER_DESTINATION_CONCEPT_UUID)) {
-                destinations.add(OrderDestination.fromString(obs.getValueText()));
+                OrderDestination destination = OrderDestination.fromString(obs.getValueText());
+                if (destination != null) {
+                    destinations.add(destination);
+                }
             }
         }