Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java
===================================================================
diff -u -r22343 -r27886
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java	(.../InvoicePlanTableManager.java)	(revision 22343)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java	(.../InvoicePlanTableManager.java)	(revision 27886)
@@ -5,13 +5,16 @@
 import java.util.Map;
 import java.util.Set;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.component.grid.GridManager;
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.common.Constants;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
@@ -34,14 +37,27 @@
 
 	private InvoicePlanManager invoicePlanManager;
 
+	private InvoicePlanManager invoicePlanOptimizeManager;
+
+	private ObjectDao objectDao;
+
 	public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) {
 		this.invoicePlanManager = invoicePlanManager;
 	}
 
+	public void setInvoicePlanOptimizeManager(
+			InvoicePlanManager invoicePlanOptimizeManager) {
+		this.invoicePlanOptimizeManager = invoicePlanOptimizeManager;
+	}
+
 	public void setGridManager(GridManager gridManager) {
 		this.gridManager = gridManager;
 	}
 
+	public void setObjectDao(ObjectDao objectDao) {
+		this.objectDao = objectDao;
+	}
+
 	public String findInvoicePlanTableListToInvoice(
 			Map<String, List<String>> parameterMap) {
 		String sql = " where (po.deliverStatus = '"
@@ -93,12 +109,19 @@
 		Set<String> exclusionType = new HashSet<String>();
 		exclusionType.add(InvoicePlan.TYPE_SECOND_SUPPLY_ROOM);
 		exclusionType.add(InvoicePlan.TYPE_EXPENSIVEGOODS_FORM);
-		String sql = " where (po.deliverStatus = '"
+		String sql = " where handleDepartCoding='"+ AcegiHelper.getCurrentOrgUnitCode() 
+				+ "' and (po.deliverStatus = '"
 				+ Constants.STATUS_WAITINGFORDELIVERING
 				+ "' or po.deliverStatus = '"
 				+ Constants.STATUS_PARTOFDELIVERING + "') and ("
 				+ SqlUtils.getStringFieldNotInCollectionsPredicate("po.type", exclusionType) + ")";
-		return invoicePlanManager.getInvoicePlanAmount(sql);
+		//return invoicePlanManager.getInvoicePlanAmount(sql);
+		/*return objectDao.countBySql(String.format("select count(0) from %s po %s",
+				InvoicePlan.class.getSimpleName(),sql));*/
+		JSONArray invoicePlanVoArray = 
+				invoicePlanOptimizeManager.getInvoicePlansByOrgAndTousseType(null, 
+						null, null, null, null, null, null);
+		return CollectionUtils.size(invoicePlanVoArray);
 	}
 
 	/*