Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r28783 -r28937
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 28783)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 28937)
@@ -808,9 +808,8 @@
 		return invoicePlanArray;
 	}
 
-	@Override
-	protected void addApplicationGoodsVoStatus(
-			Collection<ApplicationGoodsVo> list) {
+	private void addApplicationGoodsVoStatus(
+			Collection<ApplicationGoodsVo> list, String orgUnitCoding) {
 		if(CollectionUtils.isNotEmpty(list)){
 			List<String> tousseNameList = list.stream().filter(vo -> {
 				return !StringUtils.equals(DisposableGoods.TYPE_NAME, vo.getGoodsType());
@@ -820,12 +819,17 @@
 			if(CollectionUtils.isNotEmpty(tousseNameList)){
 				ResultSet rs = null;
 				String querySql = String.format("select ti.tousseName,count(0) cnt from %s ti "
+						+ "join %s td on td.id = ti.tousseDefinition_id "
 						+ "where ti.orgUnitCoding='%s' and %s "
 						+ "and ti.status in ('%s','%s') "
+						+ "and ( td.limitInvoiceDepart is null or td.limitInvoiceDepart <> '%s' "
+						+ "or (td.limitInvoiceDepart = '%s' and (ti.departCoding is null or ti.departCoding = '%s'))) "
 						+ "group by ti.tousseName having count(0) > 0", 
-						TousseInstance.class.getSimpleName(),AcegiHelper.getCurrentOrgUnitCode(),
+						TousseInstance.class.getSimpleName(),TousseDefinition.class.getSimpleName(),AcegiHelper.getCurrentOrgUnitCode(),
 						SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.tousseName", tousseNameList),
-						TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED
+						TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED,
+						Constants.STR_YES, Constants.STR_YES, 
+						orgUnitCoding == null ? "" : orgUnitCoding
 					);
 				try {
 					rs = objectDao.executeSql(querySql);
@@ -1252,7 +1256,7 @@
 					}
 				}
 			}
-			addApplicationGoodsVoStatus(list);
+			addApplicationGoodsVoStatus(list, orgUnitCoding);
 			result = reorderApplicationGoodsVo(list);
 		}