Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r34074 -r34080
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34074)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34080)
@@ -1558,7 +1558,8 @@
 				} else {
 					if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
 						var totalAmount = top.Ext.getCmp('totalAmount').getValue();
-						if(totalAmount == ''){
+						var consumptiveMaterialContainerId = top.Ext.getCmp('consumptiveMaterialContainerId').getValue();
+						if(consumptiveMaterialContainerId !== '' && totalAmount == ''){
 							top.Ext.MessageBox.confirm("请确认", "当前设备绑定的清洗耗材容器没有配置清洗耗材，是否继续操作？", function (button, text) {
 								if ("yes" == button) {
 									that.disable();
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r34078 -r34080
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 34078)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 34080)
@@ -1469,10 +1469,34 @@
 						}
 					});
 				}else {
-					that.disable();
-					var success = save();
-					if(!success){
-						that.enable();
+					if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+						var totalAmount = top.Ext.getCmp('totalAmount').getValue();
+						var consumptiveMaterialContainerId = top.Ext.getCmp('consumptiveMaterialContainerId').getValue();
+						if(consumptiveMaterialContainerId !== '' && 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();
+						}
 					}
 				}
 			}