Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r26466 -r26531
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26466)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26531)
@@ -1905,6 +1905,8 @@
 	private List<String> getPrintTousseTypes(JSONObject printScope) {
 		List<String> tousseTypes = new ArrayList<String>();
 		
+		//是否打印外部器械包代理灭菌单
+		boolean printForeignProxyDisinfectionTousse = printScope.optBoolean("printForeignProxyDisinfectionTousse");
 		boolean printTousse = printScope.optBoolean("printTousse");
 //		boolean printCustomTousse = printScope.optBoolean("printCustomTousse");
 		boolean printDisinfectGoods = printScope
@@ -1955,7 +1957,10 @@
 				
 			}
 		}
-		
+		// 器械包类型增加“外部代理灭菌”
+		if (printForeignProxyDisinfectionTousse){
+			tousseTypes.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY);
+		}
 		if (printTousse){
 			tousseTypes.add(TousseDefinition.PACKAGE_TYPE_INSIDE);
 			// 自定义包，在打印器械包时一起打印出来
@@ -2468,6 +2473,8 @@
 	public void populateSummaryList(JSONObject printScope,Collection<TousseItem> allTousseItems,
 			List<PrintSummaryVo> summaryList, int rowsPerPage,
 			boolean printApplyInfo, boolean isMergePrintMultiApplicationsOfSameDepart, String shiftName, String sheetName,boolean mergeSameGoods) {
+		// 是否打印外部器械包代理灭菌单
+		boolean isPrintForeignProxyDisinfectionTousse = printScope.optBoolean("printForeignProxyDisinfectionTousse");
 		// 默认为器械包和一次性物品不合并打印
 		boolean isMergePrintTousseAndDisposable = printScope.optBoolean("mergePrintTousseAndDiposable");
 		
@@ -2483,6 +2490,7 @@
 		Collection<TousseItem> disinfcetionItems = new ArrayList<TousseItem>();
 //		Collection<TousseItem> foreignTousseItems = new ArrayList<TousseItem>();
 		Collection<TousseItem> diposableItems = new ArrayList<TousseItem>();
+		Collection<TousseItem> foreignProxyDisinfectionTousseItems = new ArrayList<TousseItem>();
 		
 		// 将大的物品集合拆分为几个小的集合
 		for (TousseItem item : allTousseItems){
@@ -2496,6 +2504,9 @@
 			else if (TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
 				diposableItems.add(item);
 			}
+			else if (isPrintForeignProxyDisinfectionTousse && TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(tousseType)){
+				foreignProxyDisinfectionTousseItems.add(item);
+			}
 		}
 		
 		
@@ -2548,6 +2559,13 @@
 		List<Long> applicationIdsArray = new ArrayList<Long>(applicationIdsSet);
 		// 升序排列，按申请的时间顺序
 		Collections.sort(applicationIdsArray);
+		// 外部器械包代理灭菌申请单的ID集合
+		for (TousseItem item : foreignProxyDisinfectionTousseItems) {
+			Long id = item.getInvoicePlan().getId();
+			toussesMap.put(id, item);
+			
+			applicationIdsArray.add(id);
+		}
 		
 		//批量打印日志输出
 		JsonConfig config = new JsonConfig();
@@ -3189,6 +3207,9 @@
 										&& CssdUtils.getSystemSetConfigByNameBool("isShowProxyDisinfection")){
 									//代理灭菌单。那就看代理灭菌单是否在科室申领显示，如果有显示那就可以打印
 									printAmount = applyAmount;
+								}else if(tousseItem.getInvoicePlan() != null && InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION.equals(tousseItem.getInvoicePlan().getType())){
+									// 外部器械包代理灭菌申请单
+									printAmount = applyAmount;
 								}else{
 									//这里回收后还是会再打印的
 									return null;
@@ -3546,7 +3567,8 @@
 					InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM,
 					InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION,
 					InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM,
-					InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM);
+					InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM,
+					InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION);
 		}
 		// 按照申请物品的先后顺序排序
 		String sql = " po.tousseType in (:tousseTypes)"
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
===================================================================
diff -u -r22312 -r26531
--- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js	(.../printConfig.js)	(revision 22312)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js	(.../printConfig.js)	(revision 26531)
@@ -156,6 +156,7 @@
 }
 
 var invoicePlanPrintConfig = {
+	isPrintForeignProxyDisinfectionTousse : true, //批量打印申请单是否打印外部代理灭菌单
 	isPrintTousse : true,
 	isPrintDisinfectGoods : true,
     isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r25554 -r26531
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 25554)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 26531)
@@ -4,6 +4,7 @@
 	printParams.ids = ids;
 	printParams.tousseGroupIds = config.tousseGroupIds;
 	printParams.printScope = {};
+	printParams.printScope.printForeignProxyDisinfectionTousse = config.isPrintForeignProxyDisinfectionTousse; // 是否打印外部代理灭菌单
 	printParams.printScope.printTousse = config.isPrintTousse;
 	printParams.printScope.printDisinfectGoods = config.isPrintDisinfectGoods;
 	printParams.printScope.printDressing = config.isPrintDressing;