Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r23648 -r23692
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 23648)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 23692)
@@ -3688,6 +3688,9 @@
 	}else{
 		$("#remark").css('max-width','582px');
 	}
+  	if(ENABLE_SPEECH_RECOGNITION){
+  		setTousseGrammer();
+  	}
 }
 
 //装载数量根据其值更新背景色
@@ -4009,4 +4012,55 @@
 	encoded = encoded.replace('#','%23');// 对#号进行转码
 	encoded = encoded.replace('+','%2B');// 对+号进行转码
 	return encoded;
+}
+
+// 语音识别的处理
+function setTousseGrammer(){
+	var tousses = [];
+	$('#tousseItemTable').children().first().children().each(
+			function(i, element) {
+				var tousseName = $('#tousseName' + i).val();
+				var row = i+'';
+				var tousseDefinitionId = $('#tousseDefinitionID' + i).val();
+				var tousse = {
+					tousseName : tousseName,
+					row : row,
+					tousseDefinitionId : tousseDefinitionId
+				}
+				tousses.push(tousse);
+			});
+	if(tousses.length > 0){
+		var g = {
+				type: 'tousses_recycle',
+				typeInfo: JSON.stringify({
+					tousses: tousses
+				})
+		}
+		updateGrammer(g);
+		startRecognize();
+	}
+}
+
+function getRowByName(name){
+	var row = -1;
+	$('#tousseItemTable').children().first().children().each(
+			function(i, element) {
+				var tousseName = $('#tousseName' + i).val();
+				if(tousseName == name){
+					row = i;
+					return false;
+				}
+			});
+	return row;
+}
+function processSpeechResult_recycle(r){
+	if(r.grammerName == 'tousses_recycle'){
+		var row = getRowByName(r.Text);
+		if(row == -1){
+			return;
+		}
+		putTousseInTheBasket(row);
+		refreshSplitBasketView();
+		refreshAllBasketTotalNum();
+	}
 }
\ No newline at end of file
Fisheye: Tag 23692 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen_语音.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 23692 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen_语音.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r23251 -r23692
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 23251)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 23692)
@@ -43,6 +43,7 @@
 <script type="text/javascript" src="${ctx}/js/configUtils.js"></script>
 
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
+<script type="text/javascript" src="${ctx}/speech/speechRecognition.js"></script>
 
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <link rel="stylesheet" href="${ctx}/disinfectsystem/touchScreen/recycle/jShowResult.css"> 
@@ -106,6 +107,11 @@
     }else{
     	session.setAttribute("recycleAddQualityMonitoring", "display: none");
     }
+    
+    String v_ENABLE_SPEECH_RECOGNITION = (String)session.getAttribute(WebConstants.KEY_ENABLE_SPEECH_RECOGNITION);
+    boolean ENABLE_SPEECH_RECOGNITION = WebConstants.VALUE_ENABLE.equals(v_ENABLE_SPEECH_RECOGNITION);
+    
+    request.setAttribute("ENABLE_SPEECH_RECOGNITION",ENABLE_SPEECH_RECOGNITION);
 %>
 
 <script>
@@ -178,7 +184,22 @@
 
 var PACKAGE_TYPE_INSIDE = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>';
 var PACKAGE_TYPE_DISINFECTION = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>';
+var ENABLE_SPEECH_RECOGNITION = ${ENABLE_SPEECH_RECOGNITION};
+</script>
 
+<script>
+function initSpeechOnLoad(){
+	<c:if test="${ENABLE_SPEECH_RECOGNITION}">
+	initSpeech();
+	registerPerPageCallback(processSpeechResult_recycle);
+	</c:if>
+}
+
+function deinitSpeechOnUnload(){
+	<c:if test="${ENABLE_SPEECH_RECOGNITION}">
+	SpeechActiveX.deinit();
+	</c:if>
+}
 </script>
 
 <script type="text/javascript" src="tousseIntoBasketInfo.js"></script>
@@ -187,15 +208,29 @@
 </head>
 
 
-<body onload="zoomTouchScreenViewToActualScreenSize(1920,1080);loadItem();">
+<body onload="zoomTouchScreenViewToActualScreenSize(1920,1080);initSpeechOnLoad();loadItem();" onunload="deinitSpeechOnUnload();">
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0/>
 </object> 
 
 <OBJECT ID="Player" height="0" width="0"
   CLASSID="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6">
 </OBJECT>
-
+<c:if test="${ENABLE_SPEECH_RECOGNITION}">
+<OBJECT id="SpeechActiveX" name="SpeechActiveX" width="1px" height="1px" classid="clsid:DBBB0193-A86F-4D1E-B2A9-E1B8CE3F6D3A" ></OBJECT>
+<script for="SpeechActiveX" event="OnSpeechRecognized(args);" language="javascript">
+        function SpeechActiveX::OnSpeechRecognized(args) {
+        	processSpeechResult(args);
+        }
+</script>
+<script for="SpeechActiveX" event="OnSpeechRecognitionRejected(args);" language="javascript">
+        function SpeechActiveX::OnSpeechRecognitionRejected(args) {  
+        	//alert('Rejected:'+args);
+        	//Ext.getCmp('SpeechRecognitionRejected').setValue(args);
+        	//Ext.getCmp('textfield_speechRecognized').setValue(args);
+        }
+</script>
+</c:if>
 <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
     <dt><b style="font-size:20px">提示信息</b> </dt>
     <dd>
Index: ssts-web/src/main/webapp/speech/speechRecognition.js
===================================================================
diff -u -r23675 -r23692
--- ssts-web/src/main/webapp/speech/speechRecognition.js	(.../speechRecognition.js)	(revision 23675)
+++ ssts-web/src/main/webapp/speech/speechRecognition.js	(.../speechRecognition.js)	(revision 23692)
@@ -1,36 +1,64 @@
+var speechRecognition = {
+		inited: false,
+		errorCode: 0,
+		errorMsg: '',
+		perPageCallback:[]
+}
 
+function processSpeechResult(r){
+	if(r){
+		var perPageCallback = speechRecognition.perPageCallback;
+		var json = JSON.parse(r);
+		for(var i=0;i<perPageCallback.length;++i){
+			if(perPageCallback[i]){
+				try {
+					perPageCallback[i](json);
+				} catch (e) {
+				}
+			}
+		}
+	}
+}
+function registerPerPageCallback(f){
+	var perPageCallback = speechRecognition.perPageCallback;
+	for(var i=0;i<perPageCallback.length;++i){
+		if(perPageCallback[i] == f){
+			return;
+		}
+	}
+	perPageCallback.push(f);
+}
+function unregisterPerPageCallback(f){
+	var index = -1;
+	var perPageCallback = speechRecognition.perPageCallback;
+	for(var i=0;i<perPageCallback.length;++i){
+		if(perPageCallback[i] == f){
+			index = i;
+			break;
+		}
+	}
+	if(index != -1){
+		var item = perPageCallback.pop();
+		if(index < perPageCallback.length){
+			perPageCallback[index] = item;
+		}
+	}
+}
 
 function initSpeech() {
-//	var testGrammer = '{"userInfo":{"nameList":["cyf","hyh","wxm"],"fullNameList":["陈月芳","何泳红","吴雪梅"]},"orgUnitInfo":{"nameList":["东川急诊","综合病区","妇科一区"]}}';
-//	DemoActiveX.initGrammer(testGrammer);
-//	return;
-//    Ext4.Ajax.request({
-//        dataType : "json",
-//        async: false,
-////	    params : {'names': ''},
-//        url: WWWROOT + "/system/speechAction!getSpeechData.do",
-//        success: function(response) {
-//            var speechData = Ext4.decode(response.responseText);
-//            if(DemoActiveX){
-//            	var testGrammer = response.responseText;
-//            	var testGrammer = Ext4.encode(speechData);
-////            	var testGrammer = '{"userInfo":{"nameList":["cyf","hyh","wxm"],"fullNameList":["陈月芳","何泳红","吴雪梅"]},"orgUnitInfo":{"nameList":["东川急诊","综合病区","妇科一区"]}}';
-////            	DemoActiveX.initGrammer(response.responseText);
-//            	DemoActiveX.initGrammer(testGrammer);
-//            }
-//        }
-//    });
-	$.ajax({
-        type:'get',
-        url:encodeURI(WWWROOT + '/system/speechAction!getSpeechData.do?time='+new Date()),
-        data:'',
-        dataType:'json',
-        success:function(msg){
-        	alert('DemoActiveX.initGrammer');
-        	DemoActiveX.initGrammer('');
-        },
-        error:function(msg){
-        	
-        }
-    });
+	if(SpeechActiveX){
+      	SpeechActiveX.init(null);
+	}
+}
+
+function startRecognize(){
+	if(SpeechActiveX){
+      	SpeechActiveX.startRecognize();
+	}
+}
+function updateGrammer(g){
+	if(SpeechActiveX){
+		var gs = JSON.stringify(g);
+      	SpeechActiveX.updateGrammer(gs);
+	}
 }
\ No newline at end of file
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/speech/action/SpeechAction.java
===================================================================
diff -u -r23674 -r23692
--- ssts-web/src/main/java/com/forgon/disinfectsystem/speech/action/SpeechAction.java	(.../SpeechAction.java)	(revision 23674)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/speech/action/SpeechAction.java	(.../SpeechAction.java)	(revision 23692)
@@ -140,6 +140,28 @@
 		// 包名根据页面的结果去初始化语法，减少数据量，提高识别准确率
 		StrutsResponseUtils.output(obj);
 	}
+	public void getSpeechData_orgUnit() {
+		JSONObject obj = new JSONObject();
+		
+		// 科室
+		JSONObject orgUnitInfo = new JSONObject();
+		Set<String> nameSet = new HashSet<String>();
+		List<OrgUnit> allOrgUnit = objectDao.findAllObjects(OrgUnit.class.getSimpleName());
+		if(allOrgUnit != null){
+			for (OrgUnit orgUnit : allOrgUnit) {
+				String name = orgUnit.getName();
+				if(StringUtils.isNotBlank(name)){
+					nameSet.add(name);
+				}
+			}
+		}
+		
+		JSONArray nameJSONArray = JSONArray.fromObject(nameSet);
+		orgUnitInfo.put("nameList", removeJSONArray(nameJSONArray));
+		
+		obj.put("orgUnitInfo", orgUnitInfo);
+		StrutsResponseUtils.output(obj);
+	}
 	public void writeTestNames() {
 		JSONObject obj = new JSONObject();
 		{