Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r14101 -r14103
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 14101)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 14103)
@@ -47,6 +47,7 @@
 import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryManager;
@@ -110,8 +111,8 @@
 /**
  * @author Angus
  * 
- * Spring的配置文件默认读广州复大肿瘤gzfdzl文件夹的配置，
- * 需要改进为读取jdbc.properties文件中的配置。Terry Kwan，2016-07-10
+ * Spring的配置文件硬编码为读gzfdzl（广州复大肿瘤）文件夹的配置，
+ * 需要改进为读取jdbc.properties文件中project的配置。Terry Kwan，2016-07-10
  * 
  */
 @ContextConfiguration(locations={"classpath:spring/*.xml", "classpath:spring/database/sqlserver/*.xml",
@@ -195,6 +196,10 @@
 	@Autowired
 	protected GoodsStockManager goodsStockManager;
 	
+	/**
+	 * 组织单位OrgUnit供应室的id
+	 */
+	protected String orgUnitCSSDId;
 	
 	public static final float DIPOSABLEGOODS_PRICE_F =  1.1f;
 	
@@ -322,20 +327,30 @@
 		materialInstance11.setTousse(tousseDefinition1);
 		tousseDefinition1.setName("Test雾化器");
 		tousseDefinition1.setIsCleanedEntirely("是");
+		tousseDefinition1.setIsApplyEntireTousse("是");
 		tousseDefinition1.setIsRecycling(TousseDefinition.STR_YES);
 		tousseDefinition1.setIsTraceable(TousseDefinition.STR_NO);
 		tousseDefinition1.setTaskGroup("器械组"); 
 		tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
 		tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
 		tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
 		
-		tousseDefinitionManager.saveOrUpdate(tousseDefinition1);
 		
+		
 		objectDao.saveOrUpdate(materialInstance1);
 		objectDao.saveOrUpdate(materialInstance11);
 		
+		List<MaterialInstance> materialInstances = new ArrayList<MaterialInstance>();
+		materialInstances.add(materialInstance1);
+		materialInstances.add(materialInstance11);
 		
+		tousseDefinition1.setMaterialInstances(materialInstances);
 		
+		tousseDefinitionManager.saveOrUpdate(tousseDefinition1);
+		
+		assertNotNull(tousseDefinition1.getMaterialInstances());
+		assertEquals(2, tousseDefinition1.getMaterialInstances().size());
+		
 		MaterialDefinition materialDefinition2 = new MaterialDefinition();
 		materialDefinition2.setName("止血带");
 		materialDefinition2.setType("橡胶");
@@ -355,6 +370,7 @@
 		materialInstance2.setTousse(tousseDefinition2);
 		tousseDefinition2.setName("止血带[20条/扎]");
 		tousseDefinition2.setIsCleanedEntirely("否");
+		tousseDefinition2.setIsApplyEntireTousse("是");
 		tousseDefinition2.setIsRecycling(TousseDefinition.STR_YES);
 		tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO);
 		tousseDefinition2.setTaskGroup("术科组"); 
@@ -363,9 +379,16 @@
 		tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
 		tousseDefinition2.setForDisplay(true);
 		
-		tousseDefinitionManager.saveOrUpdate(tousseDefinition2);
+		materialInstances = new ArrayList<MaterialInstance>();
+		materialInstances.add(materialInstance2);
+		
+		tousseDefinition2.setMaterialInstances(materialInstances);
+		
 		objectDao.saveOrUpdate(materialInstance2);
 		
+		tousseDefinitionManager.saveOrUpdate(tousseDefinition2);
+		
+		
 		MaterialDefinition materialDefinition3 = new MaterialDefinition();
 		materialDefinition3.setName("呼吸机");
 		materialDefinition3.setType("橡胶");
@@ -385,6 +408,7 @@
 		materialInstance3.setTousse(tousseDefinition3);
 		tousseDefinition3.setName("呼吸机");
 		tousseDefinition3.setIsCleanedEntirely("否");
+		tousseDefinition3.setIsApplyEntireTousse("否");
 		tousseDefinition3.setIsRecycling(TousseDefinition.STR_YES); // 需要回收
 		tousseDefinition3.setIsTraceable(TousseDefinition.STR_YES);   // 可追溯
 		tousseDefinition3.setIsPacking(TousseDefinition.STR_YES);   // 需要装配
@@ -393,10 +417,18 @@
 		tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
 		tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
 		tousseDefinition3.setForDisplay(true);
-		tousseDefinitionManager.saveOrUpdate(tousseDefinition3);
+		
+		materialInstances = new ArrayList<MaterialInstance>();
+		materialInstances.add(materialInstance3);
+		
+		tousseDefinition2.setMaterialInstances(materialInstances);
+		
 		objectDao.saveOrUpdate(materialInstance3);
 		
+		tousseDefinitionManager.saveOrUpdate(tousseDefinition3);
 		
+		
+		
 	}
 	
 	/**
@@ -1973,14 +2005,20 @@
 	 * @param appTime		申请时间
 	 * @param JsonArray		申请物品列表
 	 */
-	protected Long createSimpleTousseOrDiposableGoodsApplicationByJsonParam(String serialNum ,String appType, String appliant, String depart , String departCode , Date appTime , JSONArray jsonArray){
+	protected Long createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
+			String serialNum, String appType, String appliant, String depart,
+			String departCode, String handleDepart, String handleDepartCoding,
+			String handleDepartId, Date appTime, JSONArray jsonArray){
 		RecyclingApplication application = new RecyclingApplication();
 		application.setSerialNumber(serialNum);
 		application.setApplicant(appliant);
 		application.setDepartCoding(departCode);
 		application.setDepart(depart);
 		application.setSettleAccountsDepartCoding(departCode);
 		application.setSettleAccountsDepart(depart);
+		application.setHandleDepart(handleDepart);
+		application.setHandleDepartCoding(handleDepartCoding);
+		application.setHandleDepartId(handleDepartId);
 		application.setApplicationTime(appTime);
 		application.setCommittedStatus(true);
 		application.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
@@ -1989,7 +2027,8 @@
 		for(int i=0;i<jsonArray.size();i++){
 			TousseItem item = new TousseItem();
 			JSONObject obj = (JSONObject)jsonArray.get(i);
-			item.setTousseName(obj.optString("name"));
+			String tousseItemName = obj.optString("name");
+			item.setTousseName(tousseItemName);
 			int amount = obj.optInt("amount");
 			item.setAmount(amount);
 			
@@ -2009,13 +2048,39 @@
 			double price = obj.optDouble("price",0d);
 			item.setPrice(price);
 			item.setRowPrice(amount * price);
-			item.setTousseType(obj.optString("tousseType"));
+			String tousseType = obj.optString("tousseType");
+			item.setTousseType(tousseType);
 			if (item.getTousseType().equals(TousseItem.TYPE_DIPOSABLE_GOODS)
 					|| appType
 							.equals(InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM)) {
 				item.setDiposable("是");
+
+				JSONObject nameObj = CssdUtils
+						.getGoodsNameAndSp(tousseItemName);
+				DisposableGoods goods = diposableGoodsManager
+						.getDisposableGoodsByName(nameObj.optString("materialName"),
+								nameObj.optString("specification"));
+				
+				if (goods != null){
+					item.setDisposableGoodsId(goods.getId());
+				}
+				else{
+					logger.debug("找不到一次性物品定义：" + tousseItemName);
+				}
+
 			} else {
 				item.setDiposable("否");
+
+				// 设置TousseDefinitionId
+					TousseDefinition td = tousseDefinitionManager
+							.getTousseDefinitionByName(tousseItemName);
+					if (td != null) {
+						Long tousseDefinitionId = td.getId();
+						item.setTousseDefinitionId(tousseDefinitionId);
+					} else {
+						logger.debug("找不到器械包定义：" + tousseItemName);
+					}
+
 			}
 			item.setInvoicePlan(application);
 			items.add(item);
@@ -2308,6 +2373,9 @@
 		assertTrue(directoryHelper.isOrgUnitName(Constants.ORG_UNIT_NAME_OR));
 		OrgUnit orgUnitCSSD = directoryHelper.createOrgUnit(Constants.ORG_UNIT_NAME_CSSD,
 				Constants.ORG_UNIT_CODE_CSSD, "name2", orgUnitROOT);
+		
+		orgUnitCSSDId = "" + orgUnitCSSD.getId();
+		
 		assertTrue(directoryHelper.isOrgUnitCodeExist(Constants.ORG_UNIT_CODE_CSSD));
 		
 		OrgUnit neike = directoryHelper.createOrgUnit("测试内科",
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java
===================================================================
diff -u -r12682 -r14103
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java	(.../InvoicePlanPrintByRecyclingNumberTests.java)	(revision 12682)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java	(.../InvoicePlanPrintByRecyclingNumberTests.java)	(revision 14103)
@@ -11,6 +11,7 @@
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.disinfectsystem.common.CSSDConstants;
@@ -61,8 +62,9 @@
 						+ "{'name' : 'TestOR胆加仪' , 'amount' : 6 , 'recyclingAmount' : 5 ,'tousseType' : '器械包'}]");
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
-				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
+				"吴启华", "测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -135,7 +137,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -210,7 +213,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -237,7 +241,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
@@ -246,7 +251,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		// 第四张单的内容
@@ -257,7 +263,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"2014102617071021", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		// 第二个科室申请的内容
@@ -268,7 +275,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第6张单内容
 		jsonArray = JSONArray
@@ -279,7 +287,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第7张单内容
 		jsonArray = JSONArray
@@ -289,7 +298,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707009", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java
===================================================================
diff -u -r12682 -r14103
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java	(.../InvoicePlanPrintByApplyNumberTests.java)	(revision 12682)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java	(.../InvoicePlanPrintByApplyNumberTests.java)	(revision 14103)
@@ -11,6 +11,7 @@
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.disinfectsystem.common.CSSDConstants;
@@ -62,7 +63,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -136,7 +138,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -216,7 +219,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -245,28 +249,31 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -279,7 +286,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -328,7 +336,7 @@
 		assertEquals("Test开胸包", pages.get(0).getRows().get(3).getGoodsName());
 		assertEquals(1, pages.get(0).getRows().get(3).getGoodsAmount().intValue());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(7).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(7).getGoodsName());
 		assertEquals(10, pages.get(0).getRows().get(7).getGoodsAmount().intValue());
 		
 		// 断言一次性物品打印单内容
@@ -383,7 +391,7 @@
 		assertEquals("Test穿刺包", pages.get(0).getRows().get(3).getGoodsName());
 		assertEquals(2, pages.get(0).getRows().get(3).getGoodsAmount().intValue());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(4).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(4).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(4).getGoodsAmount().intValue());
 		
 		// 断言第2张打印单内容
@@ -428,7 +436,8 @@
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -457,28 +466,31 @@
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId3 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId4 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -491,7 +503,8 @@
 
 		Long appId5 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -672,7 +685,8 @@
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -694,15 +708,16 @@
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
 						+ "{'name' : 'Test开口包' , 'amount' : '1' , 'price' : 5.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '雾化罐' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
+						+ "{'name' : 'Test雾化器' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
 						+ "{'name' : 'Test穿刺包' , 'amount' : '2' , 'price' : 5.0 , 'tousseType' : '器械包'},"
 						+ "{'name' : '注射器[5ML]' , 'amount' : '1' , 'price' : 2.0 ,  'tousseType' : '一次性物品'},"
 						+ "{'name' : '注射器[10ML]' , 'amount' : '1' , 'price' : 4.0 , 'tousseType' : '一次性物品'}]"
 						);
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
@@ -718,18 +733,20 @@
 
 		Long appId3 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId4 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -742,7 +759,8 @@
 
 		Long appId5 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -883,7 +901,7 @@
 		pages = summary.getPages();
 		assertEquals(2, pages.size());
 		assertEquals(1,pages.get(0).getPageNumber());
-		assertEquals("雾化罐", pages.get(0).getRows().get(0).getGoodsName());
+		assertEquals("Test雾化器", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(1, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		assertEquals(1, pages.get(0).getRows().get(0).getSerialNumber());
 		
@@ -979,7 +997,8 @@
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -1200,7 +1219,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 				
@@ -1223,13 +1243,14 @@
 		jsonArray = JSONArray
 						.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
 								+ "{'name' : 'Test开口包' , 'amount' : '1' , 'price' : 5.0 , 'tousseType' : '器械包'},"
-								+ "{'name' : '雾化罐' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
+								+ "{'name' : 'Test雾化器' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
 								+ "{'name' : 'Test穿刺包' , 'amount' : '2' , 'price' : 5.0 , 'tousseType' : '器械包'}]"
 								);
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 						"201410261707005", InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION, "刘敏" ,
-						"测试内科", "testNeike", date, jsonArray);
+						"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+						Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 				
 		assertNotNull(appId2);
 		app = recyclingApplicationManager.getRecyclingApplicationById(appId2.toString());
@@ -1243,7 +1264,7 @@
 		assertEquals("Test开口包", items.get(1).getTousseName());
 		assertEquals("器械包", items.get(1).getTousseType());
 		
-		assertEquals("雾化罐", items.get(2).getTousseName());
+		assertEquals("Test雾化器", items.get(2).getTousseName());
 		assertEquals("消毒物品", items.get(2).getTousseType());
 		
 		assertEquals("Test穿刺包", items.get(3).getTousseName());
@@ -1294,7 +1315,7 @@
 		assertEquals("Test穿刺包", rows.get(5).getGoodsName());
 		assertEquals(2, rows.get(5).getGoodsAmount().intValue());
 		
-		assertEquals("雾化罐", rows.get(6).getGoodsName());
+		assertEquals("Test雾化器", rows.get(6).getGoodsName());
 		assertEquals(1, rows.get(6).getGoodsAmount().intValue());
 	
 	}
@@ -1323,7 +1344,8 @@
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -1352,28 +1374,31 @@
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId3 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId4 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -1386,7 +1411,8 @@
 
 		Long appId5 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -1492,7 +1518,7 @@
 		assertEquals(2, pages.get(1).getRows().get(1).getGoodsAmount().intValue());
 		
 		// 第3页
-		assertEquals("止血带", pages.get(2).getRows().get(0).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(2).getRows().get(0).getGoodsName());
 		assertEquals(20, pages.get(2).getRows().get(0).getGoodsAmount().intValue());
 	
 		
@@ -1531,7 +1557,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -1560,28 +1587,31 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -1594,7 +1624,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -1691,7 +1722,7 @@
 		assertEquals("Test开胸包", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(1, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(1).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals(10, pages.get(0).getRows().get(1).getGoodsAmount().intValue());
 		
 				
@@ -1718,7 +1749,7 @@
 //		assertEquals("10", vos.get(0).getPrice());
 //		assertEquals("20", vos.get(0).getRowPrice());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(1).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(1).getGoodsAmount().intValue());
 		
 		// 断言第2张打印单内容
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java
===================================================================
diff -u -r12335 -r14103
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java	(.../RecyclingApplicationTableManagerTests.java)	(revision 12335)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java	(.../RecyclingApplicationTableManagerTests.java)	(revision 14103)
@@ -23,6 +23,7 @@
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 import test.forgon.disinfectsystem.InitCssdDataTask;
 
@@ -245,7 +246,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,"吴启华",
-				"口腔科", "3266", date, jsonArray);
+				"口腔科", "3266", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java
===================================================================
diff -u -r12682 -r14103
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java	(.../InvoicePlanPrint2ByApplyNumberTests.java)	(revision 12682)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java	(.../InvoicePlanPrint2ByApplyNumberTests.java)	(revision 14103)
@@ -14,6 +14,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
@@ -64,7 +65,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -165,7 +167,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -194,28 +197,31 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -228,7 +234,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -273,9 +280,10 @@
 		
 		assertEquals(10, pages.get(0).getRows().size());
 
-		assertEquals("注射器", pages.get(0).getRows().get(0).getGoodsName());
-		assertEquals("5ML", pages.get(0).getRows().get(0).getSp());
-		assertEquals(2, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
+		PrintRowVo printRowVo = pages.get(0).getRows().get(0);
+		assertEquals("注射器", printRowVo.getGoodsName());
+		assertEquals("5ML", printRowVo.getSp());
+		assertEquals(2, printRowVo.getGoodsAmount().intValue());
 		
 		assertEquals("纱块", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals("6*8", pages.get(0).getRows().get(1).getSp());
@@ -321,9 +329,9 @@
 		pages = summary.getPages();
 		assertEquals(1, pages.size());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(0).getGoodsName());
-		assertEquals(null, pages.get(0).getRows().get(0).getSp());
-		assertEquals(10, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
+		assertEquals("止血带[20条/扎]", printRowVo.getGoodsName());
+		assertEquals(null, printRowVo.getSp());
+		assertEquals(10, printRowVo.getGoodsAmount().intValue());
 		
 		assertEquals("TestOR胆加仪", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals(6, pages.get(0).getRows().get(1).getGoodsAmount().intValue());
@@ -349,9 +357,9 @@
 		assertEquals(1, pages.size());
 		assertEquals(6, pages.get(0).getRows().size());
 		
-		assertEquals("注射器", pages.get(0).getRows().get(0).getGoodsName());
-		assertEquals("5ML", pages.get(0).getRows().get(0).getSp());
-		assertEquals(1, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
+		assertEquals("注射器", printRowVo.getGoodsName());
+		assertEquals("5ML", printRowVo.getSp());
+		assertEquals(1, printRowVo.getGoodsAmount().intValue());
 		
 		assertEquals("注射器", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals("10ML", pages.get(0).getRows().get(1).getSp());
@@ -383,8 +391,8 @@
 		assertEquals(1, pages.size());
 		assertEquals(1, pages.get(0).getRows().size());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(0).getGoodsName());
-		assertEquals(20, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
+		assertEquals("止血带[20条/扎]", printRowVo.getGoodsName());
+		assertEquals(20, printRowVo.getGoodsAmount().intValue());
 		
 	}
 	
@@ -411,7 +419,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -440,28 +449,31 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -474,7 +486,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -564,7 +577,7 @@
 		pages = summary.getPages();
 		assertEquals(1, pages.size());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(0).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(null, pages.get(0).getRows().get(0).getSp());
 		assertEquals(10, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		
@@ -625,7 +638,7 @@
 		assertEquals(1, pages.size());
 		assertEquals(1, pages.get(0).getRows().size());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(0).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		
 	}
@@ -642,13 +655,14 @@
 						+ "{'name' : 'Test开口包' , 'amount' : '5' , 'price' : 5.0 , 'tousseType' : '器械包'},"
 						+ "{'name' : 'TestOR胆加仪' , 'amount' : '6' , 'price' : 10.0 , 'tousseType' : '器械包'},"
 						+ "{'name' : '注射器[5ML]' , 'amount' : '2' , 'price' : 2.0 , 'tousseType' : '一次性物品'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'},"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'},"
 						+ "{'name' : '纱块[6*8]' , 'amount' : '3' , 'price' : 1.0 , 'tousseType' : '一次性物品'}]"
 						);
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -739,7 +753,7 @@
 		assertEquals(1, pages.size());
 		
 		assertEquals(1,pages.get(0).getPageNumber());
-		assertEquals("止血带", pages.get(0).getRows().get(0).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		
 		assertEquals("TestOR胆加仪", pages.get(0).getRows().get(1).getGoodsName());
@@ -828,7 +842,7 @@
 		assertEquals("TestOR胆加仪", pages.get(0).getRows().get(2).getGoodsName());
 		assertEquals(6, pages.get(0).getRows().get(2).getGoodsAmount().intValue());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(3).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(3).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(3).getGoodsAmount().intValue());
 
 		
@@ -885,7 +899,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 				
@@ -908,13 +923,14 @@
 		jsonArray = JSONArray
 						.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
 								+ "{'name' : 'Test开口包' , 'amount' : '1' , 'price' : 5.0 , 'tousseType' : '器械包'},"
-								+ "{'name' : '雾化罐' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
+								+ "{'name' : 'Test雾化器' , 'amount' : '1' , 'price' : 1.0 , 'tousseType' : '消毒物品'},"
 								+ "{'name' : 'Test穿刺包' , 'amount' : '2' , 'price' : 5.0 , 'tousseType' : '器械包'}]"
 								);
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 						"201410261707005", InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION, "刘敏" ,
-						"测试内科", "testNeike", date, jsonArray);
+						"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+						Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 				
 		assertNotNull(appId2);
 		app = recyclingApplicationManager.getRecyclingApplicationById(appId2.toString());
@@ -928,7 +944,7 @@
 		assertEquals("Test开口包", items.get(1).getTousseName());
 		assertEquals("器械包", items.get(1).getTousseType());
 		
-		assertEquals("雾化罐", items.get(2).getTousseName());
+		assertEquals("Test雾化器", items.get(2).getTousseName());
 		assertEquals("消毒物品", items.get(2).getTousseType());
 		
 		assertEquals("Test穿刺包", items.get(3).getTousseName());
@@ -984,7 +1000,7 @@
 		assertEquals("Test穿刺包", rows.get(5).getGoodsName());
 		assertEquals(2, rows.get(5).getGoodsAmount().intValue());
 		
-		assertEquals("雾化罐", rows.get(6).getGoodsName());
+		assertEquals("Test雾化器", rows.get(6).getGoodsName());
 		assertEquals(1, rows.get(6).getGoodsAmount().intValue());
 	
 	}
@@ -1013,7 +1029,8 @@
 
 		Long appId1 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId1);
 		
@@ -1042,28 +1059,31 @@
 
 		Long appId2 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId3 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'price' : 10.0 , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'price' : 3.0 , 'tousseType' : '消毒物品'}]"
 						);
 
 		Long appId4 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -1076,7 +1096,8 @@
 
 		Long appId5 = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -1185,7 +1206,7 @@
 		assertEquals(2, pages.get(1).getRows().get(1).getGoodsAmount().intValue());
 		
 		// 第3页
-		assertEquals("止血带", pages.get(2).getRows().get(0).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(2).getRows().get(0).getGoodsName());
 		assertEquals(20, pages.get(2).getRows().get(0).getGoodsAmount().intValue());
 	
 		
@@ -1224,7 +1245,8 @@
 
 		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707004", InvoicePlan.TYPE_COMBO_FORM, "吴启华" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 
 		assertNotNull(appId);
 		
@@ -1253,28 +1275,31 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707005", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第三张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '10' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707006", InvoicePlan.TYPE_COMBO_FORM, "刘敏" ,
-				"测试内科", "testNeike", date, jsonArray);
+				"测试内科", "testNeike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第二个科室申请的内容
 		// 第四张单的内容
 		jsonArray = JSONArray
 				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '1' , 'tousseType' : '器械包'},"
-						+ "{'name' : '止血带' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
+						+ "{'name' : '止血带[20条/扎]' , 'amount' : '20' , 'tousseType' : '消毒物品'}]"
 						);
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707007", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		// 第五张单内容
 		jsonArray = JSONArray
@@ -1287,7 +1312,8 @@
 
 		appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
 				"201410261707008", InvoicePlan.TYPE_COMBO_FORM, "李晓" ,
-				"测试外科", "testWaike", date, jsonArray);
+				"测试外科", "testWaike", Constants.ORG_UNIT_NAME_CSSD,
+				Constants.ORG_UNIT_CODE_CSSD, orgUnitCSSDId, date, jsonArray);
 		
 		
 		JSONObject printScope = new JSONObject();
@@ -1387,7 +1413,7 @@
 		assertEquals("Test开胸包", pages.get(0).getRows().get(0).getGoodsName());
 		assertEquals(1, pages.get(0).getRows().get(0).getGoodsAmount().intValue());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(1).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals(10, pages.get(0).getRows().get(1).getGoodsAmount().intValue());
 		
 				
@@ -1414,7 +1440,7 @@
 //		assertEquals("10", vos.get(0).getPrice());
 //		assertEquals("20", vos.get(0).getRowPrice());
 		
-		assertEquals("止血带", pages.get(0).getRows().get(1).getGoodsName());
+		assertEquals("止血带[20条/扎]", pages.get(0).getRows().get(1).getGoodsName());
 		assertEquals(20, pages.get(0).getRows().get(1).getGoodsAmount().intValue());
 		
 		// 断言第2张打印单内容