Cleared all methods from OrderService

openmrs · Dec 17, 2013 · 6360b0e · 6360b0e
1 parent b66bc5c
commit 6360b0e
Show file tree

Hide file tree

Showing 29 changed files with 62 additions and 3,050 deletions.
diff --git a/api/src/main/java/org/openmrs/api/OrderService.java b/api/src/main/java/org/openmrs/api/OrderService.java
diff --git a/api/src/main/java/org/openmrs/api/db/OrderDAO.java b/api/src/main/java/org/openmrs/api/db/OrderDAO.java
@@ -21,7 +21,6 @@
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
 import org.openmrs.User;
-import org.openmrs.api.OrderService.ORDER_STATUS;
 
 /**
  * Order-related database functions
@@ -76,12 +75,10 @@ public interface OrderDAO {
 
 	/**
 	 * @see org.openmrs.api.OrderService#getOrders(java.lang.Class, java.util.List, java.util.List,
-	 *      org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
-	 *      java.util.List)
+	 *      java.util.List, java.util.List, java.util.List)
 	 */
 	public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<Patient> patients,
-	        List<Concept> concepts, ORDER_STATUS status, List<User> orderers, List<Encounter> encounters,
-	        List<OrderType> orderTypes);
+	        List<Concept> concepts, List<User> orderers, List<Encounter> encounters, List<OrderType> orderTypes);
 
 	/**
 	 * Auto generated method comment

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
@@ -26,7 +26,6 @@
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
 import org.openmrs.User;
-import org.openmrs.api.OrderService.ORDER_STATUS;
 import org.openmrs.api.db.DAOException;
 import org.openmrs.api.db.OrderDAO;
 
@@ -139,16 +138,13 @@ public <Ord extends Order> Ord getOrder(Integer orderId, Class<Ord> orderClassTy
 
 	/**
 	 * @see org.openmrs.api.db.OrderDAO#getOrders(java.lang.Class, java.util.List, java.util.List,
-	 *      org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
-	 *      java.util.List)
+	 *      java.util.List, java.util.List, java.util.List)
 	 * @see org.openmrs.api.OrderService#getOrders(java.lang.Class, java.util.List, java.util.List,
-	 *      org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
-	 *      java.util.List)
+	 *      java.util.List, java.util.List, java.util.List)
 	 */
 	@SuppressWarnings("unchecked")
 	public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<Patient> patients,
-	        List<Concept> concepts, ORDER_STATUS status, List<User> orderers, List<Encounter> encounters,
-	        List<OrderType> orderTypes) {
+	        List<Concept> concepts, List<User> orderers, List<Encounter> encounters, List<OrderType> orderTypes) {
 
 		Criteria crit = sessionFactory.getCurrentSession().createCriteria(orderClassType);
 
@@ -158,10 +154,6 @@ public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<P
 		if (concepts.size() > 0)
 			crit.add(Expression.in("concept", concepts));
 
-		// only the "ANY" status cares about voided Orders.  All others 
-		// do not want voided orders included in the list
-		if (status != ORDER_STATUS.ANY)
-			crit.add(Expression.eq("voided", false));
 		// we are not checking the other status's here because they are 
 		// algorithm dependent  
 

diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java
@@ -26,7 +26,6 @@
 import org.openmrs.aop.RequiredDataAdvice;
 import org.openmrs.api.EncounterService;
 import org.openmrs.api.OrderService;
-import org.openmrs.api.OrderService.ORDER_STATUS;
 import org.openmrs.api.context.Context;
 
 /**
@@ -65,14 +64,14 @@ public void handle(Patient patient, User originalVoidingUser, Date origParentVoi
 			OrderService os = Context.getOrderService();
 			List<Patient> patients = new ArrayList<Patient>();
 			patients.add(patient);
-			List<Order> orders = os.getOrders(Order.class, patients, null, ORDER_STATUS.ANY, null, null, null);
+			/*List<Order> orders = os.getOrders(Order.class, patients, null, ORDER_STATUS.ANY, null, null, null);
 			if (CollectionUtils.isNotEmpty(orders)) {
 				for (Order order : orders) {
 					if (order.isVoided() && order.getDateVoided().equals(origParentVoidedDate)
 					        && order.getVoidedBy().equals(originalVoidingUser))
 						os.unvoidOrder(order);
 				}
-			}
+			}*/
 		}
 	}
 }
diff --git a/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java b/api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java
@@ -66,14 +66,14 @@ public void handle(Patient patient, User voidingUser, Date voidedDate, String vo
 		}
 		//void all the orders associated with this patient
 		OrderService os = Context.getOrderService();
-		List<Order> orders = os.getOrdersByPatient(patient);
+		/*List<Order> orders = os.getOrdersByPatient(patient);
 		if (CollectionUtils.isNotEmpty(orders)) {
 			for (Order order : orders) {
 				if (!order.isVoided()) {
 					order.setDateVoided(patient.getDateVoided());
 					os.voidOrder(order, voidReason);
 				}
 			}
-		}
+		}*/
 	}
 }
diff --git a/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
@@ -307,7 +307,7 @@ public Encounter voidEncounter(Encounter encounter, String reason) {
 		OrderService orderService = Context.getOrderService();
 		for (Order o : encounter.getOrders()) {
 			if (!o.isVoided()) {
-				orderService.voidOrder(o, reason);
+				//orderService.voidOrder(o, reason);
 			}
 		}
 
@@ -339,8 +339,8 @@ public Encounter unvoidEncounter(Encounter encounter) throws APIException {
 
 		OrderService orderService = Context.getOrderService();
 		for (Order o : encounter.getOrders()) {
-			if (voidReason.equals(o.getVoidReason()))
-				orderService.unvoidOrder(o);
+			//if (voidReason.equals(o.getVoidReason()))
+			//orderService.unvoidOrder(o);
 		}
 
 		encounter.setVoided(false);