Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30631 -r30684
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30631)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30684)
@@ -3613,17 +3613,19 @@
 		});
 		if(dest.length == 1 && isConfirm == '否'){
 			var sterilingType = Ext4.getCmp('sterilingType').getValue();
-			if(dest[0].data.sterilingMethod !== sterilingType){
-				Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
-					function(btn) {
-						if (btn == 'yes') {
-							packingTousseBtnClick_DeferredExecution('是')
-						}else {
-							Ext4.getCmp('save_print').enable();
-							hidePackingTousseBtnClick_mask();
-						}
-				});
-				return
+			if(!sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType){
+				if(dest[0].data.sterilingMethod !== sterilingType){
+					Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
+						function(btn) {
+							if (btn == 'yes') {
+								packingTousseBtnClick_DeferredExecution('是')
+							}else {
+								Ext4.getCmp('save_print').enable();
+								hidePackingTousseBtnClick_mask();
+							}
+					});
+					return
+				}
 			}
 		}
 		for(var i=0;i<dest.length;i++){
@@ -3805,17 +3807,19 @@
 			});
 			if(dest.length == 1 && isConfirm == '否'){
 				var sterilingType = Ext4.getCmp('sterilingType').getValue();
-				if(dest[0].data.sterilingMethod !== sterilingType){
-					Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
-						function(btn) {
-							if (btn == 'yes') {
-								packingTousseBtnClick_DeferredExecution('是')
-							}else {
-								Ext4.getCmp('save_print').enable();
-								hidePackingTousseBtnClick_mask();
-							}
-					});
-					return
+				if(!sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType){
+					if(dest[0].data.sterilingMethod !== sterilingType){
+						Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
+							function(btn) {
+								if (btn == 'yes') {
+									packingTousseBtnClick_DeferredExecution('是')
+								}else {
+									Ext4.getCmp('save_print').enable();
+									hidePackingTousseBtnClick_mask();
+								}
+						});
+						return
+					}
 				}
 			}
 			for(var i=0;i<dest.length;i++){