Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r28262 -r28263
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 28262)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 28263)
@@ -2549,6 +2549,7 @@
 		MultiValueMap<Long, TousseItem> toussesMap = new MultiValueMap<Long, TousseItem>();
 		MultiValueMap<Long, TousseItem> disposablesMap = new MultiValueMap<Long, TousseItem>();
 		MultiValueMap<Long, TousseItem> disinfectGoodsMap = new MultiValueMap<Long, TousseItem>();
+		MultiValueMap<Long, TousseItem> foreignProxyDisinfectionTousseMap = new MultiValueMap<Long, TousseItem>();
 		
 //		MultiValueMap<Long, TousseItem> foreignToussesMap = new MultiValueMap<Long, TousseItem>();
 		
@@ -2567,7 +2568,7 @@
 			toussesMap.putAll(fixedId, tousseItems);
 			disposablesMap.putAll(fixedId, diposableItems);
 			disinfectGoodsMap.putAll(fixedId, disinfcetionItems);
-			
+			foreignProxyDisinfectionTousseMap.putAll(fixedId, foreignProxyDisinfectionTousseItems);
 		}
 		// 多张单不合并打印，按原始单据分别打印
 		else{
@@ -2589,15 +2590,15 @@
 				
 				applicationIdsSet.add(id);
 			}
+			// 外部器械包代理灭菌申请单的ID集合
+			for (TousseItem item : foreignProxyDisinfectionTousseItems) {
+				Long id = item.getInvoicePlan().getId();
+				foreignProxyDisinfectionTousseMap.put(id, item);
+				
+				applicationIdsSet.add(id);
+			}
 		}
 		
-		// 外部器械包代理灭菌申请单的ID集合
-		for (TousseItem item : foreignProxyDisinfectionTousseItems) {
-			Long id = item.getInvoicePlan().getId();
-			toussesMap.put(id, item);
-			
-			applicationIdsSet.add(id);
-		}
 		List<Long> applicationIdsArray = new ArrayList<Long>(applicationIdsSet);
 		// 升序排列，按申请的时间顺序
 		Collections.sort(applicationIdsArray);
@@ -2683,6 +2684,18 @@
 			if (toPrintItemsOfDisinfectGoods.size() >  0){
 				addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDisinfectGoods, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 			}
+			
+			// 待打印的外部代理灭菌包集合
+			List<TousseItem> toPrintItemsOfForeignProxyDisinfection = new ArrayList<TousseItem>();
+			Collection<TousseItem> foreignProxyDisinfectionCollection = foreignProxyDisinfectionTousseMap.getCollection(id);
+			if (foreignProxyDisinfectionCollection != null){
+				toPrintItemsOfForeignProxyDisinfection.addAll(foreignProxyDisinfectionCollection);
+			}
+			logger.debug("批量打印发货计划日志,待打印申请的外部代理灭菌包=" + JSONArray.fromObject(toPrintItemsOfForeignProxyDisinfection,config));
+			// 外部代理灭菌单放在批量打印的最后打印，不与其他类型申请单的物品合并在一起(ZSSXLRMYY-178)
+			if (toPrintItemsOfForeignProxyDisinfection.size() >  0){
+				addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfForeignProxyDisinfection, printApplyInfo, shiftName, sheetName,mergeSameGoods);
+			}
 
 		}
 	}