Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r34649 -r34653
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34649)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34653)
@@ -718,7 +718,7 @@
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 110,
-					hidden:!sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction,
+					hidden:!(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction || sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction),
 					items : [{
 						xtype : 'combo',
 						fieldLabel : '是否设备耗材',
@@ -1683,7 +1683,7 @@
 			top.Ext.getCmp("orginalApplicationSpecification").setValue(disposableGoods.applicationSpecification);
 			top.Ext.getCmp("orginalTransferScale").setValue(disposableGoods.transferScale);
 			top.Ext.getCmp("orginalMiddlePackageUnit").setValue(disposableGoods.middlePackageUnit);
-			if(disposableGoods.consumptiveMaterialType && disposableGoods.consumptiveMaterialType !== ''){
+			if(disposableGoods.isConsumptiveMaterial && disposableGoods.isConsumptiveMaterial == '是'){
 				top.Ext.getCmp("isConsumptiveMaterial").setValue('是');
 				top.Ext.getCmp("consumptiveMaterialUse").setValue(disposableGoods.consumptiveMaterialUse);
 				if(disposableGoods.consumptiveMaterialUse == '灭菌耗材'){
@@ -1696,12 +1696,14 @@
 					top.Ext.getCmp('volumeUnitBox').show();
 				}
 				top.Ext.getCmp("consumptiveMaterialUseBox").show();
-				var id = disposableGoods.consumptiveMaterialType.id;
-				var name = disposableGoods.consumptiveMaterialType.name;
-				var unit = disposableGoods.consumptiveMaterialType.unit;
-				top.Ext.getCmp("consumptiveMaterialTypeId").setValue(id);
-				top.Ext.getCmp("consumptiveMaterialType").setValue(name);
-				top.Ext.getCmp("volumeUnit").setValue(unit);
+				if(disposableGoods.consumptiveMaterialType){
+					var id = disposableGoods.consumptiveMaterialType.id;
+					var name = disposableGoods.consumptiveMaterialType.name;
+					var unit = disposableGoods.consumptiveMaterialType.unit;
+					top.Ext.getCmp("consumptiveMaterialTypeId").setValue(id);
+					top.Ext.getCmp("consumptiveMaterialType").setValue(name);
+					top.Ext.getCmp("volumeUnit").setValue(unit);
+				}
 			}else {
 				if(top.Ext.getCmp('isConsumptiveMaterial')){
 					top.Ext.getCmp("isConsumptiveMaterial").setValue('否');