Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/view.js
===================================================================
diff -u -r34719 -r41187
--- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/view.js	(.../view.js)	(revision 34719)
+++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/view.js	(.../view.js)	(revision 41187)
@@ -22,7 +22,8 @@
 		{ header: "sterilizationPurposeId", dataIndex: 'sterilizationPurposeId', hidden: true },
 		{ header: "disposableGoodsIds", dataIndex: 'disposableGoodsIds', hidden: true },
 		{ header: "灭菌目的", dataIndex: 'sterilizationPurposeName', width: 300, renderer: renderLink },
-		{ header: "耗材名称", dataIndex: 'disposableGoodsNames', width: document.body.clientWidth - 330, sortable: false }
+		{ header: "消耗模式", dataIndex: 'consumptionPattern', width: 300 },
+		{ header: "耗材名称", dataIndex: 'disposableGoodsNames', width: document.body.clientWidth - 630, sortable: false }
 	];
 	var tbar = [{
 		text: '关联耗材',
@@ -49,6 +50,7 @@
 		fields: [
 			{ name: 'sterilizationPurposeId' },
 			{ name: 'disposableGoodsIds' },
+			{ name: 'consumptionPattern' },
 			{ name: 'sterilizationPurposeName' },
 			{ name: 'disposableGoodsNames' }
 		]
Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js
===================================================================
diff -u -r34673 -r41187
--- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js	(.../form.js)	(revision 34673)
+++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js	(.../form.js)	(revision 41187)
@@ -10,11 +10,13 @@
 function saveConfig() {
 	var sterilizationPurposeId = top.Ext4.getCmp('sterilizationPurposeId').getValue();
 	var disposableGoodsIds = top.Ext4.getCmp('disposableGoodsIds').getValue();
+	var consumptionPattern = top.Ext4.getCmp('consumptionPattern').getValue();
 	Ext4.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/baseData/sterilizationPurposeDisposableGoodsController/saveSterilizationPurposeDisposableGoods.mhtml',
 		params: {
 			sterilizationPurposeId: sterilizationPurposeId,
-			disposableGoodsIds: disposableGoodsIds
+			disposableGoodsIds: disposableGoodsIds,
+			consumptionPattern: consumptionPattern
 		},
 		success: function (response, options) {
 			var result = Ext4.decode(response.responseText);
@@ -139,6 +141,24 @@
 					id: "sterilizationPurposeName",
 					value: obj.data.sterilizationPurposeName || ''
 				}, {
+					xtype: 'combo',
+					border: 0,
+					fieldLabel: "消耗模式",
+					name: "consumptionPattern",
+					id: "consumptionPattern",
+					valueField: 'value',
+					displayField: 'value',
+					allowBlank: false,
+					editable: false,
+					store: new top.Ext4.data.SimpleStore({
+						fields: ['value'],
+						data: [['全部消耗'], ['任意一种耗材']]
+					}),
+					value: obj.data.consumptionPattern || '全部消耗',
+					forceSelection: true,
+					mode: 'local',
+					triggerAction: 'all'
+				}, {
 					xtype: 'textfield',
 					border: 0,
 					fieldLabel: '灭菌耗材',
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r41116 -r41187
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41116)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41187)
@@ -323,16 +323,33 @@
 //根据灭菌目的加载耗材
 function loadSterilizationPurposeDisposableGoods(id) {
     Ext.Ajax.request({
-        url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getDisposableGoodsBySterilizationPurpose.do',
+        url: WWWROOT + '/disinfectSystem/baseData/sterilizationPurposeDisposableGoodsController/loadSterilizationPurposeDisposableGoods.mhtml',
         params: {
             sterilizationPurposeId: id
         },
         success: function (response, options) {
             var result = Ext.decode(response.responseText);
-            if (result.length > 0) {
-                top.Ext.getCmp('consumptiveMaterialVolumes').setValue(result.join('|'));
-            } else {
-                top.Ext.getCmp('consumptiveMaterialVolumes').setValue('');
+            if(result.success){
+                if(result.data && result.data.length > 0){
+                    var disposableGoodsNames = result.data[0].disposableGoodsNames;
+                    if(disposableGoodsNames !== ''){
+                        disposableGoodsNames = disposableGoodsNames.replace('，','|');
+                    }
+                    var consumptionPattern = result.data[0].consumptionPattern;
+                    var consumptionLabelField = top.Ext.getCmp('consumptionLabel');
+                    var labelEl = consumptionLabelField.getEl().up('div.x-form-item').down('label.x-form-item-label');
+                    if (labelEl) {
+                        if(consumptionPattern !== '任意一种耗材'){
+                            labelEl.update("已添加耗材"); 
+                        }else {
+                            labelEl.update("已添加耗材</br /><p style='margin-top: 10px;color:red'>（说明：本次消耗指定耗材中的任意一种）</p>"); 
+                        }
+                    }
+                    top.Ext.getCmp('consumptiveMaterialVolumes').setValue(disposableGoodsNames);
+                    top.Ext.getCmp('consumptionPattern').setValue(result.data[0].consumptionPattern);
+                }
+            }else {
+                showMultipleResult(result.message);
             }
         }
     });
@@ -5250,6 +5267,10 @@
                         layout: 'form',
                         hidden: !sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction,
                         items: [{
+                            xtype:'hidden',
+                            id:'consumptionPattern',
+                            name:'consumptionPattern'
+                        },{
                             xtype: 'textfield',
                             fieldLabel: "本次耗材消耗",
                             name: "consumptiveMaterialVolumes",
@@ -5264,6 +5285,7 @@
                         hidden: !sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction,
                         items: [{
                             xtype: 'textfield',
+                            id:'consumptionLabel',
                             fieldLabel: "已添加耗材",
                             readOnly: true,
                             cls: 'fieldReadOnlyNoRemove',
@@ -6976,13 +6998,15 @@
             top.Ext.getCmp("deleteDetailIds").setValue(deleteDetailIds);
 
             var consumptiveMaterialVolumes = top.Ext.getCmp("consumptiveMaterialVolumes").getValue();
+            var consumptionPattern = top.Ext.getCmp("consumptionPattern").getValue();
             if (consumptiveMaterialVolumes !== '') {
                 var consumptiveMaterialVolumesArr = consumptiveMaterialVolumes.split('|');
                 var newArr = [];
                 if (sterilizationPurposeStore.getCount() == 0) {
                     showMultipleResult('请扫码添加指定灭菌耗材后再保存记录');
                     return;
                 }
+                var hasGoods = false;
                 for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) {
                     var item = sterilizationPurposeStore.getAt(k);
                     var disposableGoodsName = item.data.disposableGoodsName;
@@ -6992,11 +7016,21 @@
                         name += '[' + specification + ']';
                     }
                     newArr.push(name);
+                    if(consumptiveMaterialVolumesArr.indexOf(name) >= 0){
+                        hasGoods = true;
+                    }
                 }
-                var res = getInclude4(newArr, consumptiveMaterialVolumesArr);
-                if (!res) {
-                    showMultipleResult('请扫码添加指定灭菌耗材后再保存记录');
-                    return;
+                if(consumptionPattern == '全部耗材'){
+                    var res = getInclude4(newArr, consumptiveMaterialVolumesArr);
+                    if (!res) {
+                        showMultipleResult('请扫码添加指定灭菌耗材后再保存记录');
+                        return;
+                    }
+                }else {
+                    if(!hasGoods){
+                        showMultipleResult('请扫码添加指定灭菌耗材后再保存记录');
+                        return;
+                    }
                 }
             }
         }