Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js
===================================================================
diff -u -r34062 -r34066
--- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js	(.../form.js)	(revision 34062)
+++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js	(.../form.js)	(revision 34066)
@@ -523,7 +523,7 @@
 	var rinserGridStore = new Ext4.data.Store({
 		proxy: {
 			type: 'ajax',
-			url: WWWROOT + '/disinfectSystem/baseData/rinserAction!getAllRinserInfo.do',
+			url: WWWROOT + '/disinfectSystem/baseData/rinserAction!getRinserNoBindContainer.do',
 			reader: {
 				root: 'data'
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r34064 -r34066
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34064)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34066)
@@ -1272,7 +1272,8 @@
 												top.Ext.getCmp('cleanParameter').setValue(result);
 											}
 										});
-										if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+										var totalAmount = top.Ext.getCmp('totalAmount').getValue() || '';
+										if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction && totalAmount !== ''){
 											getCleanMethodConsumptionVolume(record.data.id);
 										}
 									}
@@ -1549,10 +1550,33 @@
 						}
 					});
 				} else {
-					that.disable();
-					var success = save();
-					if (!success) {
-						that.enable();
+					if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+						var totalAmount = top.Ext.getCmp('totalAmount').getValue();
+						if(totalAmount == ''){
+							top.Ext.MessageBox.confirm("请确认", "当前设备绑定的清洗耗材容器没有配置清洗耗材，是否继续操作？", function (button, text) {
+								if ("yes" == button) {
+									that.disable();
+									var success = save();
+									if (!success) {
+										that.enable();
+									}
+								} else {
+									return false;
+								}
+							});
+						}else {
+							that.disable();
+							var success = save();
+							if (!success) {
+								that.enable();
+							}
+						}
+					}else {
+						that.disable();
+						var success = save();
+						if (!success) {
+							that.enable();
+						}
 					}
 				}
 			}
@@ -2004,6 +2028,12 @@
 		success: function (form, action) {
 			var validate = Ext.decode(action.result.success);
 			if (validate) {
+				if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+					var totalAmount = top.Ext.getCmp('totalAmount').getValue() || '';
+					if(totalAmount == ''){
+						showResult('该设备没有绑定清洗耗材容器');
+					}
+				}
 				Ext.getCmp('washSaveSubmitResult').setValue("1");
 				showResult(action.result.message);
 				grid.dwrReload();