Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r34071 -r34074
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34071)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34074)
@@ -729,7 +729,7 @@
 
 }
 
-function loadRinserBindConsumptiveMaterialContainer(value){
+function loadRinserBindConsumptiveMaterialContainer(value,isShow){
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/consumptiveMaterialContainerAction!loadRinserBindConsumptiveMaterialContainer.do',
 		params: {
@@ -741,7 +741,7 @@
 				var consumptiveMaterialVolumes = result.consumptiveMaterialVolumes || '';
 				top.Ext.getCmp('totalAmount').setValue(consumptiveMaterialVolumes);
 				top.Ext.getCmp('consumptiveMaterialContainerId').setValue(result.consumptiveMaterialContainerId)
-				if(consumptiveMaterialVolumes !== ''){
+				if(consumptiveMaterialVolumes !== '' && isShow == true){
 					top.Ext.getCmp('hiddenBox1').show();
 				}else {
 					top.Ext.getCmp('hiddenBox1').hide();
@@ -1213,7 +1213,7 @@
 										});
 										DWREngine.setAsync(true);
 										if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
-											loadRinserBindConsumptiveMaterialContainer(value);
+											loadRinserBindConsumptiveMaterialContainer(value,true);
 										}
 										//										}
 									}
@@ -1728,6 +1728,14 @@
 						interruptStore.add(material);
 					}
 				}
+				if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
+					loadRinserBindConsumptiveMaterialContainer(rinserName,false);
+					var cleanMethodConsumptionVolumeStr = action.result.data.cleanMethodConsumptionVolumeStr || '';
+					if(cleanMethodConsumptionVolumeStr !== ''){
+						top.Ext.getCmp('consumptiveMaterialVolumes').setValue(cleanMethodConsumptionVolumeStr);
+						top.Ext.getCmp('hiddenBox2').show();
+					}
+				}
 			}
 			var value = top.Ext.getCmp('disinfectProgram').getRawValue();
 			WashAndDisinfectRecordTableManager.getCleanParameter(value, function (result) {