Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r23290 -r23298
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23290)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23298)
@@ -2129,6 +2129,8 @@
 		int rowsPerPage = printScope.optInt("rowsPerPage", 8);
 		// 打印申请信息，而不是回收信息
 		boolean printApplyInfo = printScope.optBoolean("printApplyInfo", false);
+		// 同一个物品，是否合并打印
+		boolean mergeSameGoods = printScope.optBoolean("mergeSameGoods", false);
 		boolean isMergePrintMultiApplicationsOfSameDepart = printScope
 				.optBoolean("isMergePrintMultipleSelectedApplications", true);
 		
@@ -2208,7 +2210,7 @@
 				for (Long id : applicationIdsArray){
 					Collection<TousseItem> col = toPrintMap.getCollection(id);
 					if (col != null && col.size() > 0){
-						addToSummaryList(rowsPerPage, summaryList, new ArrayList<TousseItem>(col), printApplyInfo, shiftName, sheetName,printTemplate);
+						addToSummaryList(rowsPerPage, summaryList, new ArrayList<TousseItem>(col), printApplyInfo, shiftName, sheetName,printTemplate,mergeSameGoods);
 					}
 				}
 			}
@@ -2217,7 +2219,7 @@
 
 			populateSummaryList(printScope, allTousseItems, summaryList,
 					rowsPerPage, printApplyInfo,
-					isMergePrintMultiApplicationsOfSameDepart, shiftName, sheetName);
+					isMergePrintMultiApplicationsOfSameDepart, shiftName, sheetName,mergeSameGoods);
 
 		}
 
@@ -2235,7 +2237,7 @@
 	@Override
 	public void populateSummaryList(JSONObject printScope,Collection<TousseItem> allTousseItems,
 			List<PrintSummaryVo> summaryList, int rowsPerPage,
-			boolean printApplyInfo, boolean isMergePrintMultiApplicationsOfSameDepart, String shiftName, String sheetName) {
+			boolean printApplyInfo, boolean isMergePrintMultiApplicationsOfSameDepart, String shiftName, String sheetName,boolean mergeSameGoods) {
 		// 默认为器械包和一次性物品不合并打印
 		boolean isMergePrintTousseAndDisposable = printScope.optBoolean("mergePrintTousseAndDiposable");
 		
@@ -2372,31 +2374,31 @@
 				// 物品打印顺序，优先打印一次性物品
 				if (printOrder == CSSDConstants.PRINT_ORDER_DISPOSABLE_FIRST){
 					toPrintItemsOfDiposableGoods.addAll(toPrintItemsOfTousses);
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 				}
 				// 物品打印顺序，优先打印器械包
 				else{
 					toPrintItemsOfTousses.addAll(toPrintItemsOfDiposableGoods);
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 				}
 			}
 			// 器械包和一次性物品不合并打印
 			else{
 				// 物品打印顺序，优先打印一次性物品
 				if (printOrder == CSSDConstants.PRINT_ORDER_DISPOSABLE_FIRST){
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName);
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName,mergeSameGoods);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 				}
 				// 物品打印顺序，优先打印器械包
 				else{
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName);
-					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfTousses, printApplyInfo, shiftName, sheetName,mergeSameGoods);
+					addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDiposableGoods, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 				}
 			}
 
 			// 如果待打印的消毒物品集合不为空，则单独打印消毒物品
 			if (toPrintItemsOfDisinfectGoods.size() >  0){
-				addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDisinfectGoods, printApplyInfo, shiftName, sheetName);
+				addToSummaryList(rowsPerPage, summaryList, toPrintItemsOfDisinfectGoods, printApplyInfo, shiftName, sheetName,mergeSameGoods);
 			}
 
 		}
@@ -2603,10 +2605,10 @@
 	 */
 	private void addToSummaryList(int rowsPerPage,
 			List<PrintSummaryVo> summaryList, List<TousseItem> toPrintItems,
-			boolean printApplyInfo, String shiftName, String sheetName,String printTemplate) {
+			boolean printApplyInfo, String shiftName, String sheetName,String printTemplate,boolean mergeSameGoods) {
 
 		List<PrintRowVo> printRowVos = tousseItems2PrintRowVos(toPrintItems,
-				printApplyInfo);
+				printApplyInfo,mergeSameGoods);
 
 		makeSummaryList(rowsPerPage, summaryList, printRowVos, shiftName, sheetName,printTemplate);
 	}
@@ -2621,8 +2623,8 @@
 	 */
 	private void addToSummaryList(int rowsPerPage,
 			List<PrintSummaryVo> summaryList, List<TousseItem> toPrintItems,
-			boolean printApplyInfo, String shiftName, String sheetName) {
-		addToSummaryList(rowsPerPage, summaryList, toPrintItems, printApplyInfo, shiftName,sheetName,null);
+			boolean printApplyInfo, String shiftName, String sheetName,boolean mergeSameGoods) {
+		addToSummaryList(rowsPerPage, summaryList, toPrintItems, printApplyInfo, shiftName,sheetName,null,mergeSameGoods);
 	}
 
 	/** 
@@ -2752,8 +2754,23 @@
 		
 		return pages;
 	}
-	
-	private List<PrintRowVo> tousseItems2PrintRowVos(List<TousseItem> tousseItems, boolean printApplyInfo){
+	/**
+	 * 
+	 * @param vos
+	 * @param tousseAncestorId
+	 * @return
+	 */
+	private PrintRowVo find(Collection<PrintRowVo> vos,Long tousseAncestorId){
+		if(CollectionUtils.isNotEmpty(vos)){
+			for(PrintRowVo vo : vos){
+				if(MathTools.valueEquals(tousseAncestorId, vo.getAncestorID())){
+					return vo;
+				}
+			}
+		}
+		return null;
+	}
+	private List<PrintRowVo> tousseItems2PrintRowVos(List<TousseItem> tousseItems, boolean printApplyInfo,boolean mergeSameGoods){
 		List<PrintRowVo> rowVos = new ArrayList<PrintRowVo>();
 		
 		// 过滤掉要打印的属性的数量为零0 TousseItem
@@ -2764,9 +2781,19 @@
 		boolean afterRecyclingTousseDeliver = systemParamsObj.getAfterRecyclingTousseDeliver();
 		
 		for (int i=0;i<tousseItems.size();i++){
-			
 			PrintRowVo printRowVo = tousseItem2PrintVo(tousseItems.get(i), printApplyInfo, invoiceOrigin, afterRecyclingTousseDeliver);
-		
+			if(mergeSameGoods){
+				PrintRowVo rowVo = find(rowVos,tousseItems.get(i).getAncestorID());
+				if(rowVo != null && printRowVo != null&&!tousseItems.get(i).disposable()){
+					rowVo.setApplyAmount(MathTools.add(rowVo.getApplyAmount(), printRowVo.getApplyAmount()).intValue());
+					rowVo.setGoodsAmount(MathTools.add(rowVo.getGoodsAmount(), printRowVo.getGoodsAmount()).intValue());
+					rowVo.setRecyclingAmount(MathTools.add(rowVo.getRecyclingAmount(), printRowVo.getRecyclingAmount()).intValue());
+					rowVo.setRowPrice(MathTools.add(rowVo.getRowPrice(), printRowVo.getRowPrice()).doubleValue());
+					rowVo.setSendOutAmount(MathTools.add(rowVo.getSendOutAmount(), printRowVo.getSendOutAmount()).intValue());
+					rowVo.setPrice(MathTools.div(rowVo.getRowPrice(), rowVo.getGoodsAmount()).doubleValue());
+					printRowVo = null;
+				}
+			}
 			if (printRowVo != null){
 				rowVos.add(printRowVo);
 			}
@@ -3023,7 +3050,7 @@
 		rowVo.setSp(sp);
 		rowVo.setRowPrice(MathTools.mul(tousseItem.showPrice(), printAmount).doubleValue());
 		rowVo.setPrice(MathTools.divide(rowVo.getRowPrice(), printAmount,4));
-		
+		rowVo.setAncestorID(tousseItem.getAncestorID());
 		//修改消毒物品价格、数量
 		reSetDisinfectGoodPrintItem(tousseType, td, rowVo);
 		return rowVo;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java
===================================================================
diff -u -r22981 -r23298
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java	(.../PrintConfig.java)	(revision 22981)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java	(.../PrintConfig.java)	(revision 23298)
@@ -32,6 +32,10 @@
 	private Long id;
 	
 	private String isAppMergePrint;//同科室的多张申请单是否合并打印
+	/**
+	 * 同一物品是否合并打印
+	 */
+	private String mergeSameGoods;
 	
 	// oracle字段名不能超过30个字符
     private String isMergePrintTousseAndDisposa = MERGE_PRINT_YES; // 器械包和一次性物品是否合并打印
@@ -88,6 +92,21 @@
 		this.isAppMergePrint = isAppMergePrint;
 	}
 	
+	public String getMergeSameGoods() {
+		return mergeSameGoods;
+	}
+
+	public void setMergeSameGoods(String mergeSameGoods) {
+		this.mergeSameGoods = mergeSameGoods;
+	}
+	/**
+	 * 判断是否合并相同物品
+	 * @return
+	 */
+	public boolean mergeSameGoods(){
+		return MERGE_PRINT_YES.equals(mergeSameGoods);
+	}
+
 	public String getIsMergePrintTousseAndDisposa() {
 		return isMergePrintTousseAndDisposa;
 	}
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
===================================================================
diff -u -r15806 -r23298
--- ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java	(.../PrintRowVo.java)	(revision 15806)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java	(.../PrintRowVo.java)	(revision 23298)
@@ -9,6 +9,10 @@
 public class PrintRowVo {
 	
 	private Long tousseItemId;	// 对应的TousseItem的id
+	/**
+	 * 祖先包定义ID,用于做合并
+	 */
+	private Long ancestorID;
 	
 	private String applicationId;  // 对应的TousseItem所属的回收申请单的id
 	
@@ -72,6 +76,14 @@
 		this.tousseItemId = tousseItemId;
 	}
 
+	public Long getAncestorID() {
+		return ancestorID;
+	}
+
+	public void setAncestorID(Long ancestorID) {
+		this.ancestorID = ancestorID;
+	}
+
 	public String getApplicationId() {
 		return applicationId;
 	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r23065 -r23298
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 23065)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 23298)
@@ -59,9 +59,6 @@
 import com.forgon.disinfectsystem.recyclingapplication.service.ReAppTableSqlHandler;
 import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
-import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
-import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseMaterialErrorDamageManager;
-import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager;
 import com.forgon.disinfectsystem.vo.RecyclingApplicationVo;
 import com.forgon.results.handler.LendGoodsBriefHandler;
 import com.forgon.results.handler.ResultBackHandler;
@@ -1030,7 +1027,7 @@
 								
 								recyclingApplicationManager.populateSummaryList(printScope, allTousseItems,
 										printSummaryList, 8,
-										true, true, shiftName, ""); 
+										true, true, shiftName, "",false); 
 								
 								recyclingApplicationManager.setPrintInfo(printUser, printSummaryList);
 
@@ -1057,6 +1054,7 @@
 						printScope.put("printOrder", config.getPrintOrder());
 						printScope.put("applicationFormType", config.getApplicationFormType());
 						printScope.put("isMergePrintMultipleSelectedApplications", isMergePrintMultiApplicationsOfSameDepart);
+						printScope.put("mergeSameGoods", config.mergeSameGoods());
 						printScope.put("shiftName", shiftName);
 
 						String printConfig2 = config.getPrintConfig2();
Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js
===================================================================
diff -u -r22981 -r23298
--- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js	(.../printRecyclingConfigForm2.js)	(revision 22981)
+++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js	(.../printRecyclingConfigForm2.js)	(revision 23298)
@@ -139,6 +139,7 @@
 					Ext4.ComponentQuery.query("#configForm #shiftType")[0].setRawValue(result.data.shiftType);
 					Ext4.ComponentQuery.query("#configForm #handleDepart")[0].setRawValue(result.data.handleDepart);
 					Ext4.ComponentQuery.query("#configForm #handleDepartCoding")[0].setRawValue(result.data.handleDepartCoding);
+					Ext4.ComponentQuery.query("#configForm #mergeSameGoods")[0].setRawValue(result.data.mergeSameGoods);
 					
 					if(result.data.applicationFormType){
 						var appForms = result.data.applicationFormType.split(',');
@@ -592,6 +593,22 @@
 						allowBlank : false,
 						triggerAction : 'all',
 						anchor : '98%'
+					},{
+						xtype : 'combo',
+						fieldLabel : '不同申请单的相同物品是否合并打印',
+						id : 'mergeSameGoods',
+						name : 'mergeSameGoods',
+						editable:false,
+						valueField : 'value',
+						displayField : 'value',
+						store : ['是','否'],
+						queryMode:'local',
+						forceSelection : true,
+						triggerAction : 'all',
+						typeAhead : false,
+						allowBlank : true,
+						triggerAction : 'all',
+						anchor : '98%'
 					},
 						getShiftCombo(),{
 						xtype : 'combo',
Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig/printRecyclingConfigForm.js
===================================================================
diff -u -r22981 -r23298
--- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig/printRecyclingConfigForm.js	(.../printRecyclingConfigForm.js)	(revision 22981)
+++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig/printRecyclingConfigForm.js	(.../printRecyclingConfigForm.js)	(revision 23298)
@@ -63,6 +63,7 @@
 					top.Ext4.ComponentQuery.query("#configForm #departNames")[0].setValue(result.data.departNames);
 					top.Ext4.ComponentQuery.query("#configForm #handleDepart")[0].setRawValue(result.data.handleDepart);
 					top.Ext4.ComponentQuery.query("#configForm #handleDepartCoding")[0].setRawValue(result.data.handleDepartCoding);
+					top.Ext4.ComponentQuery.query("#configForm #mergeSameGoods")[0].setRawValue(result.data.mergeSameGoods);
 					if(result.data.applicationFormType){
 						var appForms = result.data.applicationFormType.split(',');
 						var arr = [];
@@ -224,6 +225,22 @@
 						triggerAction : 'all',
 						anchor : '98%'
 					},{
+						xtype : 'combo',
+						fieldLabel : '不同申请单的相同物品是否合并打印',
+						id : 'mergeSameGoods',
+						name : 'mergeSameGoods',
+						editable:false,
+						valueField : 'value',
+						displayField : 'value',
+						store : ['是','否'],
+						queryMode:'local',
+						forceSelection : true,
+						triggerAction : 'all',
+						typeAhead : false,
+						allowBlank : true,
+						triggerAction : 'all',
+						anchor : '98%'
+					},{
 
 						xtype : 'combo',
 						fieldLabel : '器械包与一次性物品合并打印',
Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r16316 -r23298
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 16316)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 23298)
@@ -12,6 +12,7 @@
 	printParams.printScope.mergePrintTousseAndDiposable = config.isMergePrintTousseAndDisposable;
 	printParams.printScope.isMergePrintMultipleSelectedApplications = config.isMergePrintMultipleSelectedApplications;
 	printParams.printScope.printApplyInfo = config.printApplyInfo; // 仅打印申请信息
+	printParams.printScope.mergeSameGoods = config.mergeSameGoods; // 合并打印相同物品
 	printParams.printScope.disinfectGoodsPrintMode = config.disinfectGoodsPrintMode;
 	printParams.printScope.rowsPerPage = config.rowsPerPage;
 	printParams.printScope.printOrder = config.printOrder;
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
===================================================================
diff -u -r23276 -r23298
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 23276)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 23298)
@@ -226,7 +226,7 @@
 	
 	public void populateSummaryList(JSONObject printScope,Collection<TousseItem> allTousseItems,
 			List<PrintSummaryVo> summaryList, int rowsPerPage,
-			boolean printApplyInfo, boolean isMergePrintMultiApplicationsOfSameDepart, String shiftName, String sheetName);
+			boolean printApplyInfo, boolean isMergePrintMultiApplicationsOfSameDepart, String shiftName, String sheetName,boolean mergeSameGoods);
 
 	public void setPrintInfo(String printUser, List<PrintSummaryVo> summaryList);
 	
Index: ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js
===================================================================
diff -u -r22813 -r23298
--- ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js	(.../printConfig.js)	(revision 22813)
+++ ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js	(.../printConfig.js)	(revision 23298)
@@ -163,6 +163,7 @@
     isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
     printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
     printApplyInfo : false,
+    mergeSameGoods : true,
     printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
     // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
     // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印