Index: ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js
===================================================================
diff -u -r27974 -r39038
--- ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js	(.../websocketClient.js)	(revision 27974)
+++ ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js	(.../websocketClient.js)	(revision 39038)
@@ -38,7 +38,7 @@
 }
 
 function readyFun(){
-	createWebsocket(userCode, currentOrgUnitCode, currentModule, taskGroup);
+	createWebsocket(userCode, currentOrgUnitCode, currentModule, taskGroup, websocketName);
 }
 
 var websocket = null;
@@ -54,7 +54,7 @@
  * @param module
  * @param taskGroup
  */
-function createWebsocket(userCode, orgUnitCoding, module, taskGroup){
+function createWebsocket(userCode, orgUnitCoding, module, taskGroup, websocketName){
 	var host = document.location.host;
 	this.userCode = userCode;
 	this.orgUnitCoding = orgUnitCoding;
@@ -65,7 +65,11 @@
 		//showResultWithoutSpeak("浏览器支持Websocket");
 		try{
 			//websocket = new WebSocket('ws://'+host+'/websocket/' + userName);
-			websocket = new WebSocket('ws://'+ipHostAndContext+'/websocket');
+			if(websocketName == 'urgentNotifyWebsocket' && sstsConfig.enableUrgentVoiceNotificationsFunction){
+				websocket = new WebSocket('ws://'+ipHostAndContext+'/urgentNotifyWebsocket/'+userCode+'/'+orgUnitCoding);
+			}else {
+				websocket = new WebSocket('ws://'+ipHostAndContext+'/websocket');
+			}
 			websocket.onerror = onWebsocketError;
 			websocket.onopen = onWebsocketOpen;
 			websocket.onmessage = onWebsocketMessage;
@@ -111,6 +115,31 @@
 	//调用业务方法(比如装配、审核等模块接收通知函数)
 	try{
 		var webSocketSessionJson = JSON.parse(webSocketSession);
+		if(websocketName == 'urgentNotifyWebsocket'){
+			var msgArr = [];
+			for(var i=0;i<webSocketSessionJson.datas.length;i++){
+				var msg = '';
+				var urgentMessage = webSocketSessionJson.datas[i].urgentMessage;
+				for(var j=0;j<urgentMessage.length;j++){
+					var notificationRepeatCount = urgentMessage[j].notificationRepeatCount;
+					var message = urgentMessage[j].message;
+					for(var k=0;k<notificationRepeatCount;k++){
+						msg += message + '，请及时处理；'
+					}
+				}
+				msgArr.push(msg);
+			}
+
+			if(msgArr.length > 0){
+				var version = getChromeVersion();
+				if(version && version >= 85){
+					speakerUrgentVoice(msgArr,0);
+				}else {
+					speaker.speak(msgArr.join(';'));
+				}
+			}
+			return
+		}
 		sessionId = webSocketSessionJson.sessionId;
 		var webSocketMessageJson = webSocketSessionJson.webSocketMessage;
 		var noticeTypeCode = webSocketMessageJson.noticeTypeCode;