Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java
===================================================================
diff -u -r16729 -r17813
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java	(.../RecyclingBasketTests.java)	(revision 16729)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java	(.../RecyclingBasketTests.java)	(revision 17813)
@@ -55,6 +55,7 @@
 	}
 	
 	private RecyclingRecord createRecyclingRecord2() {
+		TousseDefinition td_穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包");
 		RecyclingApplication application = new RecyclingApplication();
 		TousseItem ti1 = new TousseItem();
 		ti1.setTousseName("Test穿刺包");
@@ -63,6 +64,7 @@
 		ti1.setRecyclingAmount(null);
 		ti1.setSendOutAmount(0);
 		ti1.setInvoicePlan(application);
+		ti1.setTousseDefinitionId(td_穿刺包.getId());
 
 		List<TousseItem> applicationItems = new ArrayList<TousseItem>();
 		applicationItems.add(ti1);
@@ -105,6 +107,8 @@
 	}
 
 	private RecyclingRecord createRecyclingRecord1() {
+		TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
+		TousseDefinition td_开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包");
 		RecyclingApplication application = new RecyclingApplication();
 		TousseItem ti1 = new TousseItem();
 		ti1.setTousseName("Test开胸包");
@@ -113,6 +117,7 @@
 		ti1.setRecyclingAmount(null);
 		ti1.setSendOutAmount(0);
 		ti1.setInvoicePlan(application);
+		ti1.setTousseDefinitionId(td_开胸包.getId());
 
 		TousseItem ti2 = new TousseItem();
 		ti2.setTousseName("Test开口包");
@@ -121,6 +126,7 @@
 		ti2.setSendOutAmount(0);
 		ti2.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
 		ti2.setInvoicePlan(application);
+		ti2.setTousseDefinitionId(td_开口包.getId());
 
 		List<TousseItem> applicationItems = new ArrayList<TousseItem>();
 		applicationItems.add(ti1);
@@ -194,6 +200,12 @@
 	@Test
 	public void testRecyclingBasket2(){
 		prepareData();
+		
+		TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
+		TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包");
+		TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包");
+		TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包");
+		
 		RecyclingApplication application = new RecyclingApplication();
 		TousseItem ti1 = new TousseItem();
 		ti1.setTousseName("Test开胸包");
@@ -202,6 +214,7 @@
 		ti1.setRecyclingAmount(null);
 		ti1.setSendOutAmount(0);
 		ti1.setInvoicePlan(application);
+		ti1.setTousseDefinitionId(td_Test开胸包.getId());
 
 		TousseItem ti2 = new TousseItem();
 		ti2.setTousseName("Test开口包");
@@ -210,6 +223,7 @@
 		ti2.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
 		ti2.setSendOutAmount(0);
 		ti2.setInvoicePlan(application);
+		ti2.setTousseDefinitionId(td_Test开口包.getId());
 
 		List<TousseItem> applicationItems = new ArrayList<TousseItem>();
 		applicationItems.add(ti1);
@@ -227,10 +241,6 @@
 		record.setRecyclingApplication(application);
 		
 		JSONArray jsonArray = new JSONArray();
-		TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
-		TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包");
-		TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包");
-		TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包");
 		addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "",
 				null,"019000001");
 		addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "",