TRUNK-5687, filter out DISCONTINUE orders (openmrs#3060)

mgupta007 · Nov 21, 2019 · 6d1212a · 6d1212a
1 parent 3a66cab
commit 6d1212a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
@@ -9,6 +9,8 @@
  */
 package org.openmrs.api.db.hibernate;
 
+import static org.openmrs.Order.Action.DISCONTINUE;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -197,6 +199,11 @@ public List<Order> getOrders(OrderSearchCriteria searchCriteria) {
  if (searchCriteria.getAction() != null) {
  crit.add(Restrictions.eq("action", searchCriteria.getAction()));
  }
+ if (searchCriteria.getExcludeDiscontinueOrders() == true) {
+ crit.add(Restrictions.or(
+ Restrictions.ne("action", Order.Action.DISCONTINUE),
+ Restrictions.isNull("action")));
+ }
  SimpleExpression fulfillerStatusExpr = null;
  if (searchCriteria.getFulfillerStatus() != null) {
  fulfillerStatusExpr = Restrictions.eq("fulfillerStatus", searchCriteria.getFulfillerStatus());

diff --git a/api/src/main/java/org/openmrs/parameter/OrderSearchCriteria.java b/api/src/main/java/org/openmrs/parameter/OrderSearchCriteria.java
@@ -78,6 +78,8 @@ public class OrderSearchCriteria {
 
  private final boolean excludeCanceledAndExpired;
 
+ private final boolean excludeDiscontinueOrders;
+
  /**
  * Instead of calling this constructor directly, it is recommended to use {@link OrderSearchCriteriaBuilder}.
  * @param patient the patient the order is for
@@ -95,7 +97,9 @@ public OrderSearchCriteria(Patient patient, CareSetting careSetting, Collection<
  Order.Action action,
  Order.FulfillerStatus fulfillerStatus,
  Boolean includeNullFulfillerStatus,
- boolean excludeCanceledAndExpired, boolean includeVoided) {
+ boolean excludeCanceledAndExpired,
+ boolean excludeDiscontinueOrders,
+ boolean includeVoided) {
  this.patient = patient;
  this.careSetting = careSetting;
  this.concepts = concepts;
@@ -109,6 +113,7 @@ public OrderSearchCriteria(Patient patient, CareSetting careSetting, Collection<
  this.fulfillerStatus = fulfillerStatus;
  this.includeNullFulfillerStatus = includeNullFulfillerStatus;
  this.excludeCanceledAndExpired = excludeCanceledAndExpired;
+ this.excludeDiscontinueOrders = excludeDiscontinueOrders;
  this.includeVoided = includeVoided;
  }
 
@@ -194,6 +199,11 @@ public boolean getExcludeCanceledAndExpired() {
  return excludeCanceledAndExpired;
  }
 
+
+ public boolean getExcludeDiscontinueOrders() {
+ return excludeDiscontinueOrders;
+ }
+
  /**
  * @return whether to include the voided orders or not
  */

diff --git a/api/src/main/java/org/openmrs/parameter/OrderSearchCriteriaBuilder.java b/api/src/main/java/org/openmrs/parameter/OrderSearchCriteriaBuilder.java
@@ -47,6 +47,8 @@ public class OrderSearchCriteriaBuilder {
 
  private boolean excludeCanceledAndExpired;
 
+ private boolean excludeDiscontinueOrders;
+
  private boolean includeVoided;
 
  /**
@@ -168,6 +170,11 @@ public OrderSearchCriteriaBuilder setExcludeCanceledAndExpired(boolean excludeCa
  return (this);
  }
 
+ public OrderSearchCriteriaBuilder setExcludeDiscontinueOrders(boolean excludeDiscontinueOrders) {
+ this.excludeDiscontinueOrders = excludeDiscontinueOrders;
+ return (this);
+ }
+
  /**
  * @param includeVoided whether to include the voided orders or not
  * @return this builder instance
@@ -184,7 +191,7 @@ public OrderSearchCriteriaBuilder setIncludeVoided(boolean includeVoided) {
  public OrderSearchCriteria build() {
  return new OrderSearchCriteria(patient, careSetting, concepts, orderTypes, activatedOnOrBeforeDate, 
  activatedOnOrAfterDate, isStopped, autoExpireOnOrBeforeDate, canceledOrExpiredOnOrBeforeDate,
- action, fulfillerStatus, includeNullFulfillerStatus, excludeCanceledAndExpired, includeVoided);
+ action, fulfillerStatus, includeNullFulfillerStatus, excludeCanceledAndExpired, excludeDiscontinueOrders, includeVoided);
  }
 }
 
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2172,6 +2172,20 @@ public void getOrders_shouldreturnDiscontinuedOrders() {
  }
  }
 
+ /**
+ * @see OrderService#(OrderSearchCriteria)
+ */
+ @Test
+ public void getOrders_shouldNotReturnDiscontinuedOrders() {
+ OrderSearchCriteria orderSearchCriteria = new OrderSearchCriteriaBuilder().setExcludeDiscontinueOrders(true).build();
+ List<Order> orders = orderService.getOrders(orderSearchCriteria);
+ assertEquals(11, orders.size());
+ for (Order order : orders) {
+ assertNotEquals(order.getAction(), org.openmrs.Order.Action.DISCONTINUE);
+ }
+ }
+
+
  /**
  * @see OrderService#(OrderSearchCriteria)
  */