Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16825 -r16837
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16825)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16837)
@@ -68,6 +68,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup;
 import com.forgon.disinfectsystem.entity.basedatamanager.tousseGroup.TousseGroup;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ComboTousseComposite;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -80,7 +81,6 @@
 import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager;
 import com.forgon.disinfectsystem.maintain.basic.service.MaintainManager;
-import com.forgon.disinfectsystem.packing.dwr.table.PackingTableManager;
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
 import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager;
 import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingBasketVo;
@@ -639,7 +639,35 @@
 		
 	}
 	
+	/**
+	 * 创建聚合包定义
+	 */
+	private TousseDefinition bulidComboTousseDefinition(){
+		//聚合包定义
+		TousseDefinition comboTousse = new TousseDefinition();
+		comboTousse.setName("Test聚合包");
+		comboTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_COMBO);
+		comboTousse.setHandlerDepartCode(Constants.ORG_UNIT_CODE_NEIKE);
+		comboTousse.setHandlerDepartName(Constants.ORG_UNIT_NAME_NEIKE);
+		objectDao.saveOrUpdate(comboTousse);
+		
+		//聚合包内普通器械包
+		TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
+		TousseDefinition td_开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包");
+		
+		ComboTousseComposite ct = new ComboTousseComposite();
+		ct.setComboTousseDefinitionId(comboTousse.getId());
+		ct.setTousseDefinitionId(td_开胸包.getId());
+		objectDao.saveOrUpdate(ct);
+		
+		ComboTousseComposite ct2 = new ComboTousseComposite();
+		ct2.setComboTousseDefinitionId(comboTousse.getId());
+		ct2.setTousseDefinitionId(td_开颅包.getId());
+		objectDao.saveOrUpdate(ct2);
+		return comboTousse;
+	}
 	
+	
 	/**
 	 * 创建一个用于测试的外部代理灭菌器械包定义:<br/>
 	 * <li><h3>test121#压力蒸汽灭菌包</h3>
@@ -745,6 +773,11 @@
 		 */
 		initDiposableGoodsData();
 		
+		/**
+		 * 初始化聚合包定义
+		 */
+		bulidComboTousseDefinition();
+		
 		ForgonThreadLocalResourceManager.afterRequest();
 
 //		createDiposableGoods();
Index: ssts-web/src/test/java/test/forgon/constant/Constants.java
===================================================================
diff -u -r13052 -r16837
--- ssts-web/src/test/java/test/forgon/constant/Constants.java	(.../Constants.java)	(revision 13052)
+++ ssts-web/src/test/java/test/forgon/constant/Constants.java	(.../Constants.java)	(revision 16837)
@@ -30,4 +30,14 @@
 	 * 消毒供应室科室名称
 	 */
 	public static final String ORG_UNIT_NAME_DISINFECT = "消毒供应室";
+	
+	 /**
+	  * 测试内科编码
+	  */
+	public static final String ORG_UNIT_CODE_NEIKE= "testNeike";
+	
+	/**
+	 * 测试内科名称
+	 */
+	public static final String ORG_UNIT_NAME_NEIKE= "测试内科";
 }