Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java
===================================================================
diff -u -r16905 -r16918
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java	(.../ComboToussePackingTests.java)	(revision 16905)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java	(.../ComboToussePackingTests.java)	(revision 16918)
@@ -173,7 +173,8 @@
 		@SuppressWarnings("unchecked")
 		List<TousseInstance> instanceList = objectDao.findBySql(
 				TousseInstance.class.getSimpleName(),
-				"where po.comboTousseDefinitionId = " + ctDefinition.getId());
+				"where po.comboTousseDefinitionId = " + ctDefinition.getId() 
+				+ " and po.comboTousseInstanceId is null");
 		
 		assertNotNull(instanceList);
 		assertEquals(1, instanceList.size());
@@ -515,15 +516,16 @@
 		@SuppressWarnings("unchecked")
 		List<TousseInstance> test聚合包List = objectDao.findBySql(
 				TousseInstance.class.getSimpleName(),
-				"where po.comboTousseDefinitionId = " + test聚合包.getId());
+				"where po.comboTousseDefinitionId = " + test聚合包.getId() 
+				+ " and po.comboTousseInstanceId is null");
 		
 		assertNotNull(test聚合包List);
 		assertEquals(1, test聚合包List.size());
 		
 		@SuppressWarnings("unchecked")
 		List<TousseInstance> test穿刺聚合包List = objectDao.findBySql(
 				TousseInstance.class.getSimpleName(),
-				"where po.comboTousseDefinitionId = " + Test穿刺聚合包.getId());
+				"where po.comboTousseDefinitionId = " + Test穿刺聚合包.getId() + " and po.comboTousseInstanceId is null");
 		
 		assertNotNull(test穿刺聚合包List);
 		assertEquals(1, test穿刺聚合包List.size());
@@ -872,7 +874,7 @@
 		assertEquals(1, task.getUnPackAmount().intValue());
 		assertEquals(Test开颅包.getId(), task.getTousseDefinition().getId());
 		//4个聚合包实例
-		String comboTousseSql = "where po.comboTousseDefinitionId = " + ctDefinition1.getId();
+		String comboTousseSql = "where po.comboTousseDefinitionId = " + ctDefinition1.getId() + " and po.comboTousseInstanceId is null";
 		List<TousseInstance> tousseList = objectDao.findBySql(TousseInstance.class.getSimpleName(), comboTousseSql);
 		assertNotNull(tousseList);
 		assertEquals(4, tousseList.size());