Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r28964 -r29098
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 28964)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 29098)
@@ -155,6 +155,7 @@
 <script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js"></script>
 <script type="text/javascript" src="${ctx}/speech/speechRecognition.js"></script>
+<script type="text/javascript" src="sterilizerUnloadMessage.js"></script>
 <style type="text/css">
 .comboxItemCls .x-combo-list-item {
 	height: 20px;
@@ -419,6 +420,14 @@
 	</operation:authorize>
 }
 
+/**
+ * 灭菌卸载提醒
+ */
+ var SSTS_Sterilization_Unload = false;
+<operation:authorize ifAnyGranted="SSTS_Sterilization_Unload">
+    SSTS_Sterilization_Unload = true;
+</operation:authorize>
+
 //是否拥有两个使用记录权限
 var hasTwoUseRecordOperation = 
 	!SSTS_UseRecord_Menu && !SSTS_DepartmentUseRecord_Menu;
@@ -501,7 +510,11 @@
         }
 </script>
 </c:if>
-
+<script>
+	if(SSTS_Sterilization_Unload && globalIsSupplyRoomUser){
+		alertMessage()
+	}
+</script>
 <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td height="80" class="header" id="top_conttent1">
@@ -579,6 +592,21 @@
              <!--   当天回收物品需要在每天6:00AM之前提交申请单。 -->
     </dd>
 </dl> 
+<style>
+	.lightbox3{width:270px;height:180px;background:#FFFFFF;border:5px solid #ccc;line-height:18px;display:none; margin:0;}
+	.lightbox3 dt{background:#f4f4f4;padding:5px;word-break : break-all}
+	.lightbox3 dd{ padding:10px; margin:0;word-break : break-all}
+</style>
 <!-- alertDiv样式 -->
+<dl id="idMessageBox" class="lightbox3" style="overflow-y:scroll; overflow-x:hidden;">
+	<dt>
+		<b class="title3"><!-- 系统提示 --></b>
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<input type="button" style="position:absolute; right:0px; bottom:160px;" value=" X " onclick="closeMessageBox();"/>
+	</dt>
+	<dd class="showWord3" style="font-size:14px">
+			 <!--   当天回收物品需要在每天6:00AM之前提交申请单。 -->
+	</dd>
+</dl> 
 </body>
 </html>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r28856 -r29098
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 28856)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 29098)
@@ -3,9 +3,11 @@
 <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
 <%@page import="com.forgon.directory.vo.LoginUserData"%>
+<%@ page import="com.forgon.tools.SpringBeanManger" %>
 <%@page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@include file="/common/taglibs.jsp"%>
 <%@include file="/common/includeExtJsAndCss.jsp"%>
 <%@include file="/common/include_Ext42_Js.jsp"%>
@@ -15,6 +17,7 @@
     request.setAttribute("userName",userData.getUserFullName());
     request.setAttribute("orgUnitCoding",userData.getOrgUnitCodingFromSupplyRoomConfig());
 	request.setAttribute("hospitalName", userData.getHospitalName());
+	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
 %>
 
 <html>
@@ -37,6 +40,7 @@
 		var statusFailure = "<%=SterilizationRecord.STERILIZATION_STATUS_FAILURE%>";//灭菌失败
 		var statusInterrupt = "<%=SterilizationRecord.STERILIZATION_STATUS_INTERRUPT%>";//灭菌中断
 		var statusDraft = "<%=SterilizationRecord.STERILIZATION_STATUS_DRAFT%>";//暂存
+		var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';	//判断登录用户是否为供应室（包括一级供应室和二级供应室）
 		var sterilizerStatus;
 		var SSTS_Sterilization_Create = true;
 		<operation:authorize ifAnyGranted="SSTS_Sterilization_Create">
@@ -54,8 +58,11 @@
 		<operation:authorize ifAnyGranted="SSTS_QualityRecord_Create">
 		SSTS_QualityRecord_Create = false;
 		</operation:authorize>
+		var SSTS_Sterilization_Unload = false;
+		<operation:authorize ifAnyGranted="SSTS_Sterilization_Unload">
+			SSTS_Sterilization_Unload = true;
+		</operation:authorize>
 		
-		
 		var pop = '${param.pop}';
 		
 		var enableEditBtn = false;
@@ -102,6 +109,7 @@
 	<script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js"></script>
 	<script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script> 
 	<%--引入自己的js --%>
+	<!-- alertDiv弹出框 -->
 	<script type="text/javascript" src="${ctx}/disinfectsystem/common/sterilingMode.js"></script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js"></script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js"></script>
Index: ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp
===================================================================
diff -u -r27819 -r29098
--- ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp	(.../modifySearchMode.jsp)	(revision 27819)
+++ ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp	(.../modifySearchMode.jsp)	(revision 29098)
@@ -3,15 +3,21 @@
 <%@ page import="com.forgon.tools.SpringBeanManger" %>
 <%@ page import="com.forgon.directory.acegi.tools.AcegiHelper" %>
 <%@ page import="com.forgon.security.model.UserAttribute" %>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%
     request.setAttribute("userName",AcegiHelper.getLoginUser().getUserName());
+    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+    LoginUserData userData = (LoginUserData)session.getAttribute("loginUserData");
 %>
 
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" href="${ctx}/styles/main.css" type="text/css" />
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<!-- 支持多选的下拉框 -->
+<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript" src="${ctx }/js/common.js"></script>
 <script type="text/javascript" src="modifySearchMode.js"></script>
 <style type="text/css" media="all">
@@ -24,6 +30,11 @@
 var MESSAGE_PROMPT_TYPE_DETAIL = "<%=UserAttribute.MESSAGE_PROMPT_TYPE_DETAIL%>";
 var MESSAGE_PROMPT_TYPE_NAME = "<%=UserAttribute.MESSAGE_PROMPT_TYPE_NAME%>";
 var MESSAGE_PROMPT_TYPE_SIMPLE = "<%=UserAttribute.MESSAGE_PROMPT_TYPE_SIMPLE%>";
+var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';	//判断登录用户是否为供应室（包括一级供应室和二级供应室）
+var SSTS_Sterilization_Unload = false;
+<operation:authorize ifAnyGranted="SSTS_Sterilization_Unload">
+    SSTS_Sterilization_Unload = true;
+</operation:authorize>
 </script>
 </head>
 <body>
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) {
Index: ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js	(revision 0)
+++ ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js	(revision 29098)
@@ -0,0 +1,195 @@
+
+//初始化远程访问对象
+function InitAjax() {
+	var ajax;
+	if (window.XMLHttpRequest) {
+		ajax = new XMLHttpRequest();
+	} else if (window.ActiveXObject) {
+		var versions = [ 'Microsoft.XMLHTTP', 'MSXML.XMLHTTP',
+				'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.7.0',
+				'Msxml2.XMLHTTP.6.0', 'Msxml2.XMLHTTP.5.0',
+				'Msxml2.XMLHTTP.4.0', 'MSXML2.XMLHTTP.3.0',
+				'MSXML2.XMLHTTP' ];
+		for (var i = 0; i < versions.length; i++) {
+			try {
+				alert(versions[i]);
+				ajax = new ActiveXObject(versions[i]);
+				if (ajax) {
+					return ajax;
+				}
+			} catch (e) {
+			}
+			alert(e);
+		}
+	}
+	return ajax;
+}
+
+var msgBox;
+var xh;
+var time = 300;
+var timeout;
+var synth = '';
+var synthMsg = '';
+var ids = [];
+var resultHtml = '';
+var timeArr = [];
+
+//语音提示
+function handleSpeak(text) {
+	synthMsg.text = text;
+	synthMsg.lang = "zh-CN";  // 使用的语言:中文
+	synthMsg.volume = 1;      // 音量：1
+	synthMsg.rate = 2;        // 语速：1
+	synthMsg.pitch = 1;       // 音高：1
+	synth.speak(synthMsg);    // 播放
+}
+
+//关闭语音提示
+function handleStop(e) {
+	synthMsg.text = e;
+	synthMsg.lang = "zh-CN";
+	synth.cancel(synthMsg);
+}
+
+//第一步：调用灭菌卸载提示的接口
+function alertMessage(){
+	xh = InitAjax();
+	xh.onreadystatechange = getReadyLoadSterilization;
+	xh.open("GET", '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizeUnloadWarning.do', true);
+	xh.send();
+}
+
+//第二步：接收接口返回的数据
+function getReadyLoadSterilization() {
+	if (xh.readyState == 4) {
+		if (xh.status == 200) {
+			if(msgBox){
+				msgBox.close(); 
+			}
+			if(synthMsg){
+				handleStop('');
+			}
+			clearTimeout(timeout);
+			time = 0;
+			var result = JSON.parse(xh.response);
+			var html = '';
+			resultHtml = '';
+			var j = 0;
+			timeArr = [];
+			for(var i=0;i<result.data.length;i++){
+				var minWaiteTime = result.data[i].minWaiteTime;
+				var sterilizerId = result.data[i].sterilizerId;
+				var sterilizerName = result.data[i].sterilizerName;
+				if(minWaiteTime <= 0){
+					html += '<p>'+sterilizerName + ' 请卸载灭菌物品'+'</p>';
+				}
+
+				if(minWaiteTime > 0){
+					timeArr[j] = minWaiteTime;
+					j++
+				}
+
+				ids[i] = sterilizerId;
+			}
+			resultHtml = html;
+			alerMsgBox();
+			return true;
+		} else {
+			return false;
+		}
+	} else
+		return false;
+}
+
+//第三步：弹出灭菌卸载提醒的提示窗口
+function alerMsgBox(){
+    var obj;
+    var idMessageBox;
+    if(document.getElementById("idMessageBox")){
+        obj = document;
+        idMessageBox = document.getElementById("idMessageBox");
+    }else if(window.parent.document.getElementById('idMessageBox')){
+        obj = window.parent.document;
+        idMessageBox = window.parent.document.getElementById("idMessageBox");
+	}
+	if(resultHtml !== ''){
+		obj.getElementsByClassName("showWord3")[0].innerHTML = resultHtml;
+		obj.getElementsByClassName("title3")[0].innerHTML = '灭菌卸载提醒';
+		msgBox = new AlertBox(idMessageBox,{
+			fixed:false,
+			onShow: function(){
+				this.box.style.right = 0;
+				this.box.style.bottom = 0;
+				synth = window.speechSynthesis;
+				synthMsg = new SpeechSynthesisUtterance();
+				loopMsg(resultHtml)
+			}
+		});
+	
+		msgBox.show(); 
+	}
+
+	if(timeArr.length > 0){
+		var minTime = Math.min.apply(null, timeArr);
+		timeOut(minTime);
+	}
+}
+
+//第四步：每两秒循环一次语音提示
+function loopMsg(html){
+	handleSpeak(html);
+	setTimeout(function(){
+		if(time > 0){
+			time--
+			loopMsg(html);
+		}
+	}, 2000);
+}
+
+//第五步：未到灭菌卸载时间的灭菌炉开始倒计时，倒计时重新调次接口
+function timeOut(minTime){
+	timeout = setTimeout(function(){
+		if(minTime > 0){
+			minTime--;
+			timeOut(minTime);
+		}else {
+			if(msgBox){
+				msgBox.close();
+			}
+			alertMessage();
+			clearTimeout(timeout);
+		}
+	}, 1000);
+}
+
+//第六步：弹出确认框是否关闭语音提示和灭菌卸载提醒
+function closeMessageBox(){
+	Ext.MessageBox.confirm("请确认",'是否关闭提示和语音？',
+		function(button, text) {
+			if ("yes" == button){
+				if(ids.length == 0){
+					return
+				}
+				var idsStr = ids.join(',');
+				xh = InitAjax();
+				xh.onreadystatechange = sterilizerUnloadState;
+				xh.open("GET", '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerUnload.do?sterilizerIds='+idsStr, true);
+				xh.send();
+			}
+	});
+}
+
+//第七步：关闭语音提示和灭菌卸载提醒
+function sterilizerUnloadState(){
+	if (xh.readyState == 4) {
+		if (xh.status == 200) {
+			msgBox.close(); 
+			handleStop('');
+			time = 0;
+		} else {
+			return false;
+		}
+	} else
+		return false;
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r28906 -r29098
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 28906)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 29098)
@@ -297,6 +297,11 @@
 						if( typeof(interruptWin) != 'undefined' && interruptWin != null ){
 							interruptWin.close();
 						}
+						if(SSTS_Sterilization_Unload && globalIsSupplyRoomUser){
+							setTimeout(function(){
+								window.parent.alertMessage()
+							}, 5000);
+						}
 					}
 		});	
 	}