Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
===================================================================
diff -u -r24242 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js	(.../cleanMethodForm.js)	(revision 24242)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js	(.../cleanMethodForm.js)	(revision 32837)
@@ -142,10 +142,10 @@
 	});
 	DWREngine.setAsync(true);
 	if(type == 0){//直接打印
-		print_cleanMethod(barcode,name,unit,'print');
+		print_commonFun(barcode,name,unit,'print','清洗程序');
 	}else{//打印预览
 		var barcodeStr =  top.Ext.getCmp('barcode').getValue();
-		print_cleanMethod(barcodeStr,name,unit,'preview');
+		print_commonFun(barcodeStr,name,unit,'preview','清洗程序');
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js
===================================================================
diff -u -r24242 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js	(.../sterilisationView.js)	(revision 24242)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js	(.../sterilisationView.js)	(revision 32837)
@@ -180,7 +180,7 @@
  	   					}
  	   				});
  	   				DWREngine.setAsync(true);
- 	   				print_sterilisationMethod(barcode,name,unit,'preview');
+ 	   				print_commonFun(barcode,name,unit,'print','灭菌程序');
  	   			}
  	   			}else{
  	   			MsgTip.msg('提示','未选择打印的内容！',true,3);
@@ -222,19 +222,4 @@
 			} ]
 		});
 
-	});
-
-function print_sterilisationMethod(barcode,name,unitName,printType) {
-	var obj = {
-			barcode:barcode,
-			name:name,
-			unitName:unitName,
-			defaultPrintFun: function(){
-				defaultPrint(barcode,name,unitName);
-			},
-			dataSourceName: '灭菌程序',
-			styleName: '默认',
-			_printType: printType
-	}
-	printObjWithdefaultPrintFun(obj);
-};
\ No newline at end of file
+	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
===================================================================
diff -u -r24242 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 24242)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 32837)
@@ -282,10 +282,10 @@
 		});
 		DWREngine.setAsync(true);
 	if(type == 0){//直接打印
-		print_sterilisationMethod(barcodeStr,name,unit,'print');
+		print_commonFun(barcodeStr,name,unit,'print','灭菌程序');
 	}else{//打印预览
 		var barcode = top.Ext.getCmp('barcode').getValue();
-		print_sterilisationMethod(barcode,name,unit,'preview');
+		print_commonFun(barcode,name,unit,'preview','灭菌程序');
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js
===================================================================
diff -u -r31471 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 31471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 32837)
@@ -194,7 +194,7 @@
 		    		}
 		    	});
 		    	DWREngine.setAsync(true);
-		    	print_rinser(barcode,name,unit);
+		    	print_commonFun(barcode,name,unit,'print','清洗机');
     	    }
     	   }else{
     		   MsgTip.msg('提示','未选择打印的内容！',true,3);
@@ -277,19 +277,4 @@
 			data.ddel.innerText = count+' 行被选中';
 		}
 	})
-});
-
-function print_rinser(barcode,name,unitName,printType) {
-	var obj = {
-			barcode:barcode,
-			name:name,
-			unitName:unitName,
-			defaultPrintFun: function(){
-				defaultPrint(barcode,name,unitName);
-			},
-			dataSourceName: '清洗机',
-			styleName: '默认',
-			_printType: printType
-	}
-	printObjWithdefaultPrintFun(obj);
-};
\ No newline at end of file
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js
===================================================================
diff -u -r24242 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js	(.../cleanMethodView.js)	(revision 24242)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js	(.../cleanMethodView.js)	(revision 32837)
@@ -140,7 +140,7 @@
 		    			}
  	   				});
  	   				DWREngine.setAsync(true);
- 	   				print_cleanMethod(barcode,name,unit,'preview');
+ 	   				print_commonFun(barcode,name,unit,'print','清洗程序');
  	   			}
  	   			}else{
  	   			MsgTip.msg('提示','未选择打印的内容！',true,3);
@@ -182,19 +182,4 @@
 			} ]
 		});
 
-	});
-
-function print_cleanMethod(barcode,name,unitName,printType) {
-	var obj = {
-			barcode:barcode,
-			name:name,
-			unitName:unitName,
-			defaultPrintFun: function(){
-				defaultPrint(barcode,name,unitName);
-			},
-			dataSourceName: '清洗程序',
-			styleName: '默认',
-			_printType: printType
-	}
-	printObjWithdefaultPrintFun(obj);
-};
\ No newline at end of file
+	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r32836 -r32837
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32836)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32837)
@@ -4328,4 +4328,24 @@
         top.Ext.getCmp('totalAmountOfTousses').setValue(parseInt(top.Ext.getCmp('totalAmountOfTousses').getValue(), 10) - count);
     }
     item.remove();
-}
\ No newline at end of file
+}
+
+//整合清洗机打印
+function print_commonFun(barcode, name, unitName, printType,viewType) {
+    var obj = {
+        barcode: barcode,
+        name: name,
+        unitName: unitName,
+        defaultPrintFun: function () {
+            if (printType == PRINT_TYPE_PREVIEW) {
+                preview(barcode, name, unitName);
+            } else {
+                defaultPrint(barcode, name, unitName);
+            }
+        },
+        dataSourceName: viewType,
+        styleName: '默认',
+        _printType: printType
+    }
+    printObjWithdefaultPrintFun(obj);
+};
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js
===================================================================
diff -u -r31471 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js	(.../sterilizerView.js)	(revision 31471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js	(.../sterilizerView.js)	(revision 32837)
@@ -268,7 +268,7 @@
      	   					}
      	   				});
      	   				DWREngine.setAsync(true);
-     	   				print_sterilizer(barcode,name,unit,'preview');
+     	   				print_commonFun(barcode,name,unit,'print','灭菌炉');
      	   		}
      	   		}else{
      	   			  MsgTip.msg('提示','未选择打印的内容！',true,3);
@@ -354,18 +354,4 @@
 			}
 		})
 
-	});
-function print_sterilizer(barcode,name,unitName,printType) {
-	var obj = {
-			barcode:barcode,
-			name:name,
-			unitName:unitName,
-			defaultPrintFun: function(){
-				defaultPrint(barcode,name,unitName);
-			},
-			dataSourceName: '灭菌炉',
-			styleName: '默认',
-			_printType: printType
-	}
-	printObjWithdefaultPrintFun(obj);
-};
\ No newline at end of file
+	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r31471 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 31471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 32837)
@@ -1542,10 +1542,10 @@
 	});
 	DWREngine.setAsync(true);
 	if(type == 0){//直接打印
-		print_sterilizer(barcodeStr,name,unit,'print');
+		print_commonFun(barcodeStr,name,unit,'print','灭菌炉');
 	}else{//打印预览
 		var barcode = top.Ext.getCmp('barcode').getValue();
-		print_sterilizer(barcode,name,unit,'preview');
+		print_commonFun(barcode,name,unit,'preview','灭菌炉');
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r31471 -r32837
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 31471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 32837)
@@ -721,10 +721,10 @@
 	});
 	DWREngine.setAsync(true);
 	if(type == 0){//直接打印
-		print_rinser(barcodeStr,name,unit,'print');
+		print_commonFun(barcodeStr,name,unit,'print','清洗机');
 	}else{//打印预览
 		var barcode = top.Ext.getCmp('barcode').getValue();
-		print_rinser(barcode,name,unit,'preview');
+		print_commonFun(barcode,name,unit,'preview','清洗机');
 	}
 }