Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r28348 -r28391
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 28348)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 28391)
@@ -156,8 +156,10 @@
 if (sstsConfig.printLabelWhenReviewing == true){
 	reviewBtnText = "<b>"+ reviewViewText +"并打印标签</b>";
 }
+if(sstsConfig.printLabelWhenSterilizing == true){
+	reviewBtnText = "<b>"+ reviewViewText +"物品</b>";
+}
 
-
 var hidenReviewPatientName = true ;
 var hidenReviewTreatmentNum = true;
 var hidenReviewHospitalNum = true ;
@@ -973,8 +975,8 @@
 							var result = Ext.decode(response.responseText);
 							showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage);
 							if (result.success){
-								// 审核时打印标签
-								if (sstsConfig.printLabelWhenReviewing == true){
+								// 审核时打印标签，printLabelWhenReviewing为true并且没有配置printLabelWhenSterilizing为true
+								if (sstsConfig.printLabelWhenReviewing == true && !sstsConfig.printLabelWhenSterilizing){
 									var tousses = result.tousses;
 									var printGroupType = Ext.getCmp('printGroupType').getValue();
 									var cfg = createPrintLabelsConfig(printGroupType);
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printSterilizationLabel.js
===================================================================
diff -u -r28384 -r28391
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printSterilizationLabel.js	(.../printSterilizationLabel.js)	(revision 28384)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printSterilizationLabel.js	(.../printSterilizationLabel.js)	(revision 28391)
@@ -440,7 +440,7 @@
 			   			readOnly : true,
 			   			anchor : '100%',
 						value:sterilizationUser,
-			   			cls:'x-item-disabled',
+			   			cls:'x-item-disabled'
 						
 			   		}]
 			   	},{
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28303 -r28391
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28303)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28391)
@@ -22,9 +22,12 @@
 var idCardTaskNode = null;
 var MATERIAL_NAME_IDCARD = "器械包标识牌";
 var packingBtnText = "装配并打印标签";
-if (sstsConfig.printLabelWhenReviewing == true){
+if(sstsConfig.printLabelWhenSterilizing  == true){
 	packingBtnText = "装配无菌物品";
 }
+if (sstsConfig.printLabelWhenReviewing == true && !sstsConfig.printLabelWhenSterilizing){
+	packingBtnText = "装配无菌物品";
+}
 var inspectorName = "检查人";
 if(sstsConfig.aliasNameOfInspectorField){
 	inspectorName = sstsConfig.aliasNameOfInspectorField;
@@ -3831,7 +3834,7 @@
 //		tousseesToPrint.push(tousses[i]);
 //	}
 	// 现在不打印标签
-	if (isPrintLabelNow == false || !packing){
+	if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
 		showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
 	}
 	// 现在打印标签
@@ -3865,7 +3868,8 @@
 	}
 	
 	// 现在不打印标签
-	if (isPrintLabelNow == false || !packing){
+	//if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
+	if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
 		showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
 	}
 	// 现在打印标签