Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java
===================================================================
diff -u -r12331 -r12682
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java	(.../InvoicePlanPrintByRecyclingNumberTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java	(.../InvoicePlanPrintByRecyclingNumberTests.java)	(revision 12682)
@@ -46,7 +46,9 @@
 		
 	}
 
-	// 一张申请单测试
+	/**
+	 * 一张申请单测试
+	 */
 	@Test
 	public void testGetPrintObjectOfDeptWithOneApplication(){
 		initCSSDData();
@@ -117,6 +119,77 @@
 		
 	}
 	
+	/**
+	 * 一张申请单测试，包含敷料包
+	 */
+	@Test
+	public void testGetPrintObjectOfDeptWithDressingTousse(){
+		initCSSDData();
+		changeSetting2InvoiceOriginRecycling();
+		
+		Date date = new Date();
+		JSONArray jsonArray = JSONArray
+				.fromObject("[{'name' : 'Test开胸包' , 'amount' : 2 , 'tousseType' : '器械包'},"
+						+ "{'name' : 'Test开口包' , 'amount' : 5 , 'tousseType' : '器械包'},"
+						+ "{'name' : 'Test治疗巾' , 'amount' : 6 , 'recyclingAmount' : 5 ,'tousseType' : '敷料包'}]");
+
+		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
+				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
+				"测试内科", "testNeike", date, jsonArray);
+
+		assertNotNull(appId);
+		
+		RecyclingApplication app = recyclingApplicationManager.getRecyclingApplicationById(appId.toString());
+		assertNotNull(app);
+		
+		List<TousseItem> items = app.getApplicationItems();
+		assertEquals(3, items.size());
+		assertEquals("Test开胸包", items.get(0).getTousseName());
+		assertEquals("器械包", items.get(0).getTousseType());
+		
+		assertEquals("Test开口包", items.get(1).getTousseName());
+		assertEquals("器械包", items.get(1).getTousseType());
+		
+		assertEquals("Test治疗巾", items.get(2).getTousseName());
+		assertEquals("敷料包", items.get(2).getTousseType());
+		
+		JSONObject printScope = new JSONObject();
+		
+		printScope.put("printTousse", true);
+		printScope.put("printCustomTousse", true);
+		printScope.put("printDisinfectGoods", true);
+		printScope.put("printDisposable", true);
+		printScope.put("disinfectGoodsPrintMode", CSSDConstants.PRINT_WITH_DIPOSABLE_GOODS_FIRST);
+		printScope.put("isMergePrintMultipleSelectedApplications", false);
+		
+		List<PrintSummaryVo> printList = new ArrayList<PrintSummaryVo>();
+		
+		recyclingApplicationManager.getPrintObjectOfDept(printScope,
+				"testNeike", "李晓敏", printList);
+		
+		assertEquals(1, printList.size());
+		
+		PrintSummaryVo vo = printList.get(0);
+		assertEquals("吴启华", vo.getApplicant());
+		assertEquals("测试内科", vo.getDepart());
+		assertEquals("310000120", vo.getDepartBarcode());
+		assertEquals("201410261707004", vo.getSerialNum());
+		
+		List<PrintPageVo> pages = vo.getPages();
+		assertEquals(1, pages.size());
+		
+		List<PrintRowVo> rows = pages.get(0).getRows();
+		
+		assertEquals("Test开胸包", rows.get(0).getGoodsName());
+		assertEquals(2, rows.get(0).getGoodsAmount().intValue());
+		
+		assertEquals("Test开口包", rows.get(1).getGoodsName());
+		assertEquals(5, rows.get(1).getGoodsAmount().intValue());
+		assertEquals("Test治疗巾", rows.get(2).getGoodsName());
+		assertEquals(5, rows.get(2).getGoodsAmount().intValue());
+		
+	}
+	
 	// 多张单测试
 	@Test
 	public void testGetPrintObjectOfDeptWithMultipleApplications(){
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java
===================================================================
diff -u -r12335 -r12682
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java	(.../InvoicePlanPrintByApplyNumberTests.java)	(revision 12335)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java	(.../InvoicePlanPrintByApplyNumberTests.java)	(revision 12682)
@@ -46,7 +46,9 @@
 		
 	}
 
-	// 一张申请单测试
+	/**
+	 * 一张申请单测试
+	 */
 	@Test
 	public void testGetPrintObjectOfDeptWithOneApplication(){
 		initCSSDData();
@@ -118,6 +120,80 @@
 		
 	}
 	
+	/**
+	 * 一张申请单测试，包含敷料包
+	 */
+	@Test
+	public void testGetPrintObjectOfDeptWithDressingTousse(){
+		initCSSDData();
+		changeSetting2InvoiceOriginApplication();
+		
+		Date date = new Date();
+		JSONArray jsonArray = JSONArray
+				.fromObject("[{'name' : 'Test开胸包' , 'amount' : '2' , 'tousseType' : '器械包'},"
+						+ "{'name' : 'Test开口包' , 'amount' : '5' , 'tousseType' : '器械包'},"
+						+ "{'name' : 'Test治疗巾' , 'amount' : '6' , 'tousseType' : '敷料包'}]");
+
+		Long appId = createSimpleTousseOrDiposableGoodsApplicationByJsonParam(
+				"201410261707004", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "吴启华" ,
+				"测试内科", "testNeike", date, jsonArray);
+
+		assertNotNull(appId);
+		
+		RecyclingApplication app = recyclingApplicationManager.getRecyclingApplicationById(appId.toString());
+		assertNotNull(app);
+		
+		List<TousseItem> items = app.getApplicationItems();
+		assertEquals(3, items.size());
+		assertEquals("Test开胸包", items.get(0).getTousseName());
+		assertEquals("器械包", items.get(0).getTousseType());
+		
+		assertEquals("Test开口包", items.get(1).getTousseName());
+		assertEquals("器械包", items.get(1).getTousseType());
+		
+		assertEquals("Test治疗巾", items.get(2).getTousseName());
+		assertEquals("敷料包", items.get(2).getTousseType());
+		
+		JSONObject printScope = new JSONObject();
+		
+		printScope.put("printTousse", true);
+		printScope.put("printCustomTousse", true);
+		printScope.put("printDisinfectGoods", true);
+		printScope.put("printDisposable", true);
+		printScope.put("disinfectGoodsPrintMode", CSSDConstants.PRINT_WITH_TOUSSE_FIRST);
+		printScope.put("isMergePrintMultipleSelectedApplications", false);
+		
+		List<PrintSummaryVo> printList = new ArrayList<PrintSummaryVo>();
+		
+		recyclingApplicationManager.getPrintObjectOfDept(printScope,
+				"testNeike", "李晓敏", printList);
+		
+		assertEquals(1, printList.size());
+		
+		PrintSummaryVo vo = printList.get(0);
+		assertEquals("吴启华", vo.getApplicant());
+		assertEquals("测试内科", vo.getDepart());
+		assertEquals("310000120", vo.getDepartBarcode());
+		assertEquals("201410261707004", vo.getSerialNum());
+		assertEquals("", vo.getHeader());
+		
+		List<PrintPageVo> pages = vo.getPages();
+		assertEquals(1, pages.size());
+		
+		List<PrintRowVo> rows = pages.get(0).getRows();
+		
+		assertEquals("Test开胸包", rows.get(0).getGoodsName());
+		assertEquals(2, rows.get(0).getGoodsAmount().intValue());
+//		assertEquals("10", vos.get(0).getPrice());
+//		assertEquals("20", vos.get(0).getRowPrice());
+		
+		assertEquals("Test开口包", rows.get(1).getGoodsName());
+		assertEquals(5, rows.get(1).getGoodsAmount().intValue());
+		assertEquals("Test治疗巾", rows.get(2).getGoodsName());
+		assertEquals(6, rows.get(2).getGoodsAmount().intValue());
+		
+	}
+	
 	// 通用申请单测试
 	@Test
 	public void testGetPrintObjectOfDeptWithComboApplication(){
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java
===================================================================
diff -u -r12335 -r12682
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java	(.../InvoicePlanPrint2ByApplyNumberTests.java)	(revision 12335)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java	(.../InvoicePlanPrint2ByApplyNumberTests.java)	(revision 12682)
@@ -48,7 +48,9 @@
 		
 	}
 
-	// 一张申请单测试
+	/**
+	 * 一张申请单测试
+	 */
 	@Test
 	public void testGetPrintObjectOfDeptWithOneApplication(){
 		initCSSDData();