Index: ssts-web/src/main/webapp/personalSetting/modifySearchMode.js
===================================================================
diff -u -r27819 -r29098
--- ssts-web/src/main/webapp/personalSetting/modifySearchMode.js	(.../modifySearchMode.js)	(revision 27819)
+++ ssts-web/src/main/webapp/personalSetting/modifySearchMode.js	(.../modifySearchMode.js)	(revision 29098)
@@ -18,6 +18,26 @@
 		, [MESSAGE_PROMPT_TYPE_NAME,MESSAGE_PROMPT_TYPE_NAME]
 		, [MESSAGE_PROMPT_TYPE_SIMPLE,MESSAGE_PROMPT_TYPE_SIMPLE]]
 	});
+
+	var enableSterilizationUnloadStore = new Ext.data.SimpleStore( {
+		fields : ['value','fontText'],
+		data : [['0','是'], ['1','否']]
+	});
+
+	//灭菌炉Store
+	var sterilizerStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!loadAllSterilizerList.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+			{name : 'id',mapping : 'id'},
+			{name : 'name',mapping : 'name'}
+		]
+		)
+	});
     
     var formObj = new Ext.FormPanel({
         labelAlign: 'left',
@@ -28,6 +48,10 @@
         width: 400,
         labelWidth:80,
         items: [{
+			xtype:'hidden',
+			id:'ignoredSterilizerIds',
+			name:'ignoredSterilizerIds'
+		},{
 			xtype : "fieldset",
 			title : '匹配方式',
 			layout:'column',
@@ -147,6 +171,71 @@
 			}]
 		},{
 			xtype : "fieldset",
+			title : '灭菌卸载提醒设置',
+			layout:'column',
+			autoHeight : true,
+			hidden:!(SSTS_Sterilization_Unload && globalIsSupplyRoomUser),
+			items : [{
+				layout : 'form',
+				labelWidth : 120,
+				items : [{
+					xtype : 'combo',
+					fieldLabel : '启用灭菌卸载提醒',
+					id : 'enableSterilizeUnloadWarning',
+					name : 'enableSterilizeUnloadWarning',
+					width : 140,
+					valueField : 'value',
+					displayField : 'fontText',
+					value:'否',
+					store : enableSterilizationUnloadStore,
+					forceSelection : true,
+					mode : 'local',
+					editable:false,
+					triggerAction : 'all',
+					anchor : '100%',
+					readOnly : true
+				}]
+			},{
+				layout : 'form',
+				labelWidth : 120,
+				items : [{
+					xtype : 'numberfield',
+                    minValue:0,
+					fieldLabel : '灭菌卸载时间(分钟)',
+					id : 'sterilizeUnloadTimes',
+					name : 'sterilizeUnloadTimes',
+					allowDecimals: false,
+					allowNegative:false,
+					width : 140
+				}]
+			},{
+				layout : 'form',
+				labelWidth : 120,
+				items : [{
+					xtype : 'multiSelect',
+					fieldLabel : '不提示卸载的灭菌炉',
+					width : 140,
+					valueField : 'id',
+					displayField : 'name',
+					store : sterilizerStore,
+					triggerAction : 'all',
+					mode : 'remote',
+					listWidth:180,
+					forceSelection : false,
+					name : "ignoredSterilizerName",
+					id : "ignoredSterilizerName",
+					editable : false,
+					readOnly:true,
+					anchor : '100%',
+					listeners:{
+						select:function(e){
+							Ext.getCmp('ignoredSterilizerIds').setValue(e.value)
+						}
+					}
+				}]
+			}]
+		},{
+			xtype : "fieldset",
 			title : '个性化设置',
 			layout:'column',
 			autoHeight : true,
@@ -231,6 +320,15 @@
 					Ext.getCmp('suggestiveWarningInfo').setValue(searchMode.split("##")[2]);
 					Ext.getCmp('messagePromptType').setValue(searchMode.split("##")[3]);
 					Ext.getCmp('mouseHoverEventOfApply').setValue(searchMode.split("##")[4]);
+					Ext.getCmp('enableSterilizeUnloadWarning').setValue(searchMode.split("##")[5]);
+					Ext.getCmp('sterilizeUnloadTimes').setValue(searchMode.split("##")[6]);
+					var ids = searchMode.split("##")[7] || '';
+					if(ids !== ''){
+						sterilizerStore.load();
+						sterilizerStore.on('load',function(){
+							Ext.getCmp('ignoredSterilizerName').setValue(ids);
+						});
+					}
 				}
 			},
 			failure : function(response, options) {