Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r14660 -r14932
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14660)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14932)
@@ -1947,22 +1947,57 @@
 		        		}
 		        	});
 		        	}
-		        },
-		        {text: '打印器械包及消毒物品', handler: function(){
+		        },{
+		        	text: '打印器械包',
+		        	hidden:!sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler:function(){
+			        	checkPrintStatus(function(){
+			        		var ids = getSelectedIds();
+			        		if (ids != null && ids != false){
+			        			top.Ext.MessageBox.confirm("请确认", "要打印所选的发货单的器械包吗？",
+				        				function(btn) {
+				        					if (btn == 'yes') {
+				        						batchPrintInvoiceWithType(ids,'器械包');
+				        					}
+				        				});
+			        		}
+			        	});
+			        	}
+			        
+		        },{
+		        	text: '打印消毒物品', 
+		        	hidden:!sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler:function(){
+			        	checkPrintStatus(function(){
+			        		var ids = getSelectedIds();
+			        		if (ids != null && ids != false){
+			        			top.Ext.MessageBox.confirm("请确认", "要打印所选的发货单的消毒物品吗？",
+				        				function(btn) {
+				        					if (btn == 'yes') {
+				        						batchPrintInvoiceWithType(ids,'消毒物品');
+				        					}
+				        				});
+			        		}
+			        	});
+			        	}
+			        
+		        },{
+		        	text: '打印器械包及消毒物品', 
+		        	hidden:sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler: function(){
 		        	checkPrintStatus(function(){
 		        		var ids = getSelectedIds();
 		        		if (ids != null && ids != false){
 		        			top.Ext.MessageBox.confirm("请确认", "要打印所选发货单的器械包及消毒物品吗？",
 		        				function(btn) {
 		        					if (btn == 'yes') {
-		        						batchPrintInvoiceWithType(ids,'器械包');
+		        						batchPrintInvoiceWithType(ids,'器械包及消毒物品');
 		        					}
 		        				});
 		        		}
 		        	});
-	        	} 
-	        },
-		        {text: '打印全部物品', handler: function(){
+	        		} 
+		        },{text: '打印全部物品', handler: function(){
 		        	checkPrintStatus(function(){
     					var ids = getSelectedIds();
     	        		if (ids != null && ids != false){
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14931 -r14932
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14931)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14932)
@@ -5569,6 +5569,16 @@
 			jsontype.put("tousseGroupID", 0L);
 			jsontype.put("type", type);
 			types.add(jsontype);
+		}else if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(type)){
+			JSONObject tousseType= new JSONObject();
+			tousseType.put("tousseGroupID", 0L);
+			tousseType.put("type", TousseDefinition.PACKAGE_TYPE_INSIDE);
+			types.add(tousseType);
+		}else if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type)){
+			JSONObject disinfectType= new JSONObject();
+			disinfectType.put("tousseGroupID", 0L);
+			disinfectType.put("type", TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+			types.add(disinfectType);
 		}else if("全部".equals(type)){
 			JSONObject disposableType= new JSONObject();
 			disposableType.put("tousseGroupID", 0L);
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
===================================================================
diff -u -r14706 -r14932
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js	(.../config.js)	(revision 14706)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js	(.../config.js)	(revision 14932)
@@ -45,5 +45,7 @@
   //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除配置为2以外的其他值都使用以前的单科室的多单打印
   printInvoiceVersion:2,
   //回收人默认用登录用户
-  recyclingUserDefault:false
+  recyclingUserDefault:false,
+  //批量打印发货单,打印消毒物品和器械包是否分开为两个按钮,如果为true,表示分开为两个按钮,如果为false或者没有配置,都是合并为一个按钮
+  splitTousseAndDisinfectInvoiceBtn:true
 }
\ No newline at end of file