Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
===================================================================
diff -u -r19154 -r20442
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 19154)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 20442)
@@ -931,35 +931,40 @@
 		
 		JSONObject tousseObj = tousses.getJSONObject(0);
 		
+		
 		assertEquals("Test开胸包", tousseObj.opt("tousseName"));
 		assertEquals("测试内科", tousseObj.opt("department"));
 		
+		JSONObject tousseObj2 = tousses.getJSONObject(10);
+		assertEquals("Test开胸包", tousseObj2.opt("tousseName"));
+		assertEquals("测试外科", tousseObj2.opt("department"));
+		
 		JSONArray barcodes = tousseObj.optJSONArray("barcodes");
+		JSONArray barcodes2 = tousseObj2.optJSONArray("barcodes");
 		
 		assertNotNull(barcodes);
 		assertEquals(1, barcodes.size());
 		
 		TousseInstance tousseInstance = (TousseInstance)barcodeManager
 				.getBarcodeByBarcode(barcodes.getString(0));
+		TousseInstance tousseInstance2 = (TousseInstance)barcodeManager
+				.getBarcodeByBarcode(barcodes2.getString(0));
 		
-		
 		assertNotNull(tousseInstance);
+		assertNotNull(tousseInstance2);
 		
 		PackingRecord packingRecord = packingManager.getPackingRecordByTousseInstance(tousseInstance);
+		PackingRecord packingRecord2 = packingManager.getPackingRecordByTousseInstance(tousseInstance2);
 		
-		
-		JSONObject tousseObj2 = tousses.getJSONObject(10);
-		
-		assertEquals("Test开胸包", tousseObj2.opt("tousseName"));
-		assertEquals("测试外科", tousseObj2.opt("department"));
-		
 		assertNotNull(packingRecord);
+		assertNotNull(packingRecord2);
 		
 		assertEquals("cssduser1", packingRecord.getPacker());
 		assertEquals("Test开胸包", packingRecord.getTousseName());
 		assertEquals("器械包", packingRecord.getTousseType());
 		
-		assertEquals(30, packingRecord.getAmount().intValue());
+		assertEquals(10, packingRecord.getAmount().intValue());
+		assertEquals(20, packingRecord2.getAmount().intValue());
 		
 		assertEquals("治包1组", packingRecord.getTaskGroup());
 //		assertEquals("是", packingRecord.getIsTraceable());
@@ -972,12 +977,15 @@
 		assertFalse(tousseObj.optBoolean("printExpirationDate"));
 		
 		List<TousseInstance> tousseInstances = packingRecord.getTousseInstanceList(objectDao);
+		List<TousseInstance> tousseInstances2 = packingRecord2.getTousseInstanceList(objectDao);
 		
 		assertNotNull(tousseInstances);
-		assertEquals(30, tousseInstances.size());
+		assertEquals(10, tousseInstances.size());
+		assertNotNull(tousseInstances2);
+		assertEquals(20, tousseInstances2.size());
 		
-		assertEquals("Test开胸包", tousseInstances.get(20).getTousseName());
-		assertEquals("棉布", tousseInstances.get(20).getPackageType());
+		assertEquals("Test开胸包", tousseInstances.get(0).getTousseName());
+		assertEquals("棉布", tousseInstances.get(0).getPackageType());
 		
 		packingTask1 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1);
 		assertNull(packingTask1);  // 装配任务完成后被删除