Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14485 -r14502
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14485)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14502)
@@ -965,6 +965,10 @@
 		return list;
 	}
 	
+	/**
+	 * 4.1不再使用二级供应室回收单的机制
+	 */
+	@Deprecated
 	@Override
 	public void createSecondSupplyRoomRecyclingApplicationByTousse(
 			Map<String, Integer> tousseNameAndAmount, String applicant,
@@ -1157,9 +1161,12 @@
 		boolean needRecycling = false;
 		Integer includeInvoiceItems = InvoicePlan.SIGNED_FALSE;
 		for (Entry<String, Integer> entry : tousseNameAndAmount.entrySet()) {
-			String tousseName = entry.getKey();
-			TousseDefinition tousseDefinition = tousseDefinitionManager
-					.getTousseDefinitionByName(tousseName);
+			String tousseDefinitionIdAndName = entry.getKey();
+			String tousseDefinitionId = tousseDefinitionIdAndName.split("_")[0];
+			String tousseName = tousseDefinitionIdAndName.split("_")[1];
+			/*TousseDefinition tousseDefinition = tousseDefinitionManager
+					.getTousseDefinitionByName(tousseName);*/
+			TousseDefinition tousseDefinition = tousseDefinitionManager.getTousseDefinitionById(Long.parseLong(tousseDefinitionId));
 			if (tousseDefinition != null) {
 				String tousseType = tousseDefinition.getTousseType();
 				if(TousseDefinition.PACKAGE_TYPE_DRESSING