TRUNK-4332 Add getDiscontinationOrder - post review fixes

rkorytkowski · rkorytkowski · commit 1ec16b652fdb · 2014-03-31T14:19:15.000+02:00
diff --git a/api/src/main/java/org/openmrs/api/OrderService.java b/api/src/main/java/org/openmrs/api/OrderService.java
@@ -147,6 +147,8 @@ public interface OrderService extends OpenmrsService {
 	 * @param order
 	 * @return the discontinuation order or null if none
 	 * @throws APIException
+	 * @since 1.10
+
 	 * @should return discontinuation order if order has been discontinued
 	 * @should return null if order has not been discontinued
 	 */
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
@@ -162,14 +162,10 @@ public Order getOrderByUuid(String uuid) {
 	
 	@Override
 	public Order getDiscontinuationOrder(Order order) {
-		Order nextOrder = (Order) sessionFactory.getCurrentSession().createQuery(
-		    "from Order o where o.previousOrder = :orderId").setInteger("orderId", order.getId()).uniqueResult();
+		Order discontinuationOrder = (Order) sessionFactory.getCurrentSession().createCriteria(Order.class).add(
+		    Restrictions.eq("previousOrder", order)).add(Restrictions.eq("action", Order.Action.DISCONTINUE)).uniqueResult();
 		
-		if (nextOrder != null && Order.Action.DISCONTINUE.equals(nextOrder.getAction())) {
-			return nextOrder;
-		} else {
-			return null;
-		}
+		return discontinuationOrder;
 	}
 	
 	/**
