Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r16772 -r16773
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 16772)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 16773)
@@ -127,6 +127,22 @@
 	{
 		return rinserManager.isDefineDeviceInterface(rinserName);
 	}
+	/**
+	 * 是否有清洗机需要确认完成
+	 * @return
+	 */
+	public boolean isRinserNeedConfirn()
+	{
+		List<Rinser> rinsers = rinserManager.findAllRinser();
+		if(rinsers != null && rinsers.size() > 0 ){
+			for(Rinser rinser : rinsers){
+				if( Rinser.STR_YES.equals(rinser.getIsWashConfirm())){
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 	
 	public String findWashRecordMaterials(String washRecordId){
 		return washAndDisinfectRecordManager.loadWashRecordMaterials(washRecordId).toString();
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r16772 -r16773
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 16772)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 16773)
@@ -195,7 +195,13 @@
      	 }},
 	    {id : 'autoWidthColumn',header : "清洗总数",width : 140,dataIndex : 'washMaterialAmount',sortable: false}
 	];
-
+	// 是否有清洗机需要确认完成
+	var haveNeedConfirn = false;
+	DWREngine.setAsync(false);
+	WashAndDisinfectRecordTableManager.isRinserNeedConfirn(function(result){
+			haveNeedConfirn = result;
+		});
+	DWREngine.setAsync(true);
 	// 清洗机
 	rinserStore = new Ext.data.SimpleStore({
 		fields : ['rinserName','conCurrent', 'rinserBarcode', 'cleanMethodDataList'],
@@ -261,15 +267,15 @@
 		}
 	}, '-', {
 		text : '清洗完成',
-		hidden : SSTS_WashRecord_Create,
+		hidden : SSTS_WashRecord_Create || (!haveNeedConfirn),
 		iconCls : 'btn_ext_application_save',
 		id : 'editTbar',
 		handler : function() {
 			updateWashStatus(washed);
 		}
 	}, '-', {
 		text : '清洗失败',
-		hidden : SSTS_WashRecord_Create,
+		hidden : SSTS_WashRecord_Create || (!haveNeedConfirn),
 		iconCls : 'btn_ext_application_error',
 		id : 'editTbar',
 		handler : function() {