Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
===================================================================
diff -u -r14407 -r16843
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java	(.../AddRecyclingRecordTests.java)	(revision 14407)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java	(.../AddRecyclingRecordTests.java)	(revision 16843)
@@ -39,7 +39,7 @@
 	
 	private void prepareData(){
 		initCSSDData();
-		createCustomTousseDefinition();
+		createDisinfectionTousseDefinition();
 		makeActiveUser("cssduser1");
 	}
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java
===================================================================
diff -u -r16787 -r16843
--- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java	(.../TousseDefinitionManagerTests.java)	(revision 16787)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java	(.../TousseDefinitionManagerTests.java)	(revision 16843)
@@ -27,8 +27,8 @@
 	private void prepareData(){
 		initCSSDData();
 		
-		// 9种器械包定义，3种消毒物品定义，共12种
-		int baseDataTousseDefinitionsCount = 14;
+		// 11种器械包定义，3种消毒物品定义,1种聚合包定义 共15种
+		int baseDataTousseDefinitionsCount = 15;
 		
 		List<TousseDefinition> definitions = tousseDefinitionManager.findTousseDefinitionList();
 		
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16837 -r16843
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16837)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16843)
@@ -253,12 +253,12 @@
 	}
 	
 	/**
-	 * 创建一个用于测试的消毒物品器械包定义:<br/>
+	 * 创建两个用于测试的消毒物品器械包定义:<br/>
 	 * <li><h3>test止血带</h3>
 	 * 	<ul>test止血带<strong>100</strong>扎</ul>
 	 * </li>
 	 */
-	protected void createCustomTousseDefinition(){
+	protected void createDisinfectionTousseDefinition(){
 		MaterialDefinition materialDefinition = new MaterialDefinition();
 		materialDefinition.setName("test止血带");
 		materialDefinition.setType("橡胶");
@@ -649,6 +649,7 @@
 		comboTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_COMBO);
 		comboTousse.setHandlerDepartCode(Constants.ORG_UNIT_CODE_NEIKE);
 		comboTousse.setHandlerDepartName(Constants.ORG_UNIT_NAME_NEIKE);
+		comboTousse.setIsCustomPacking(TousseDefinition.STR_NO);
 		objectDao.saveOrUpdate(comboTousse);
 		
 		//聚合包内普通器械包
@@ -754,12 +755,12 @@
 		initCssdServiceDepts();
 		
 		/**
-		 * 初始化材料与器械包定义
+		 * 初始化材料与器械包定义(器械包定义数量:11)
 		 */
 		initMaterialAndTousseData();
 		
 		/**
-		 * 初始化消毒物品定义
+		 * 初始化消毒物品定义(器械包定义数量:3)
 		 */
 		initDisinfectToussesData();
 		
@@ -774,7 +775,7 @@
 		initDiposableGoodsData();
 		
 		/**
-		 * 初始化聚合包定义
+		 * 初始化聚合包定义(器械包定义数量:1)
 		 */
 		bulidComboTousseDefinition();
 		
@@ -1274,7 +1275,7 @@
 	}
 
 	/**
-	 * 初始化器械材料及包定义
+	 * 初始化器械材料及包定义(11个)
 	 * 器械材料：
 	 * 			【Test镊子】、【Test钳子】、【Test棉球】、【Test胆道探条】
 	 * 			【Test静脉拉钩】（1对）、【Test取石钳】（1对）、【Test拉钩】
@@ -1702,15 +1703,15 @@
 	 * 初始化所有器械包定义
 	 */
 	protected void initBasicData(){
-		//消毒物品器械包定义
-		createCustomTousseDefinition();
+		//消毒物品器械包定义(2个)
+		createDisinfectionTousseDefinition();
 		//一次性物品定义
 		createDiposableGoods();
-		//外部代理灭菌器械包定义
+		//外部代理灭菌器械包定义(1个)
 		createForeignProxyTousseDefinition();
-		//外来器械包定义
+		//外来器械包定义(1个)
 		createForeignTousseDefinition();
-		//普通器械包定义
+		//普通器械包定义(4个)
 		createTousseDefinition();
 	}
 	
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
===================================================================
diff -u -r14407 -r16843
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java	(.../ComboRecyclingApplicationTests.java)	(revision 14407)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java	(.../ComboRecyclingApplicationTests.java)	(revision 16843)
@@ -42,7 +42,7 @@
 
 	private void prepareData(){
 		initCSSDData();
-		createCustomTousseDefinition();
+		createDisinfectionTousseDefinition();
 		makeActiveUser("cssduser1");
 	}