Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp
===================================================================
diff -u -r41172 -r41185
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp	(.../routineMonitoringForm.jsp)	(revision 41172)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp	(.../routineMonitoringForm.jsp)	(revision 41185)
@@ -46,6 +46,79 @@
 if(!sstsConfig.enableCustomEditModeForQualityMonitoring){
 	SSTS_RoutineMonitoring_CustomEdit = true;
 }
+
+/**
+ * 页面完成加载后,调用此函数
+ * 此函数被Ext.onReady函数调用,然后再调用安卓的函数
+ */
+function loadPage(){
+	try{
+		if(AndroidObj){
+			AndroidObj.loadPage();
+		}
+	}catch(e){
+		
+	}
+}
+/**
+ * 添加或查询质量监测(提供给外部调用,如android端)
+ * @param id 质量监测记录的id,如果为空则表示为添加
+ */
+function addRoutineMonitoringEntrance(id){
+	addRoutineMonitoring(id);
+}
+
+/**
+ * 设置用户信息,提供给外部调用
+ * @param userName 用户名,工号
+ * @param userFullName 用户姓名全名
+ */
+function setLogonUserInfo(userNameArg,userFullNameArg){
+	Ext.getCmp("createUserName").setValue(userFullNameArg);
+	return "设置登记人信息成功";
+}
+
+/**
+ * Android端返回至列表页面
+ */
+function backToAndroidListPage() {
+	try{
+		if(AndroidObj){
+			AndroidObj.backToListPage();
+		}
+	}catch(e){
+		
+	}
+}
+
+/**
+ * 调用Android端播放语音
+ * @param content 播放语音的内容
+ */
+function speakContentThrouhtAndroid(content) {
+	try{
+		if(AndroidObj){
+			AndroidObj.speakContent(content);
+		}
+	}catch(e){
+		
+	}
+}
+
+/**
+ * 接收到所扫描的条码参数(通常来自嵌入端,比如android)
+ * @param barcode 条码
+ */
+function receiveScannedDeviceBarcode(barcode){
+	try{
+		//speakContentThrouhtAndroid("定期监测前端页面收到传入的条码为" + barcode);
+		if(AndroidObj){
+			AndroidObj.backToListPage();
+		}
+	}catch(e){
+		
+	}
+}
 </script>
 <script type="text/javascript" src="routineMonitoringForm.js?version=${svnRevision}"></script>
 
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r41175 -r41185
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41175)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41185)
@@ -44,6 +44,11 @@
 		// 回收页面进来
 		closeQMLayer();
 	} else {
+		try{
+			backToAndroidListPage();
+		}catch(e){
+			
+		}
 		if (top.Ext.getCmp('qualityMonitoringWin')) {
 			top.Ext.getCmp('qualityMonitoringWin').close();
 		}
@@ -2051,6 +2056,11 @@
 							failure: function (response, options) {
 								var result = Ext.decode(response.responseText);
 								showResult(result.message);
+								try{
+									speakContentThrouhtAndroid(result.message);
+								}catch(e){
+									
+								}
 							}
 						});
 					} else {
@@ -5107,7 +5117,7 @@
 		disableShowImageButton = false;
 	}
 	//formPanel = getFormPanelContent(id);
-	if (id != null && id != '') {
+	if (id != null && id != 0 && id != '') {
 		Ext.getCmp('formName').addClass("fieldReadOnlyNoRemove");
 		Ext.getCmp('responsibilityPart').addClass("fieldReadOnlyNoRemove");
 		Ext.Ajax.request({
@@ -8285,6 +8295,11 @@
 	} else {
 		showResult(msg);
 	}
+	try{
+		speakContentThrouhtAndroid(msg);
+	}catch(e){
+		
+	}
 }
 
 function isLoadIframe() {
@@ -8305,4 +8320,12 @@
 function loadDataForPacking(responPartName, washRecordId, tousseItems, ids, remarks, newMaterialCountRecords) {
 	materialCountRecords = newMaterialCountRecords;
 	addQualityMonitoringByResponPart(responPartName, washRecordId, tousseItems, ids, remarks);
-}
\ No newline at end of file
+}
+
+Ext.onReady(function () {
+	try{
+		loadPage();
+	}catch(e){
+		
+	}
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp
===================================================================
diff -u -r41129 -r41185
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp	(.../qualitymonitoringInstanceForm.jsp)	(revision 41129)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp	(.../qualitymonitoringInstanceForm.jsp)	(revision 41185)
@@ -69,6 +69,85 @@
 	var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 	var qualityMonitoringUpdateMode = '${qualityMonitoringUpdateMode}';
 	var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
+
+	/**
+	 * 页面完成加载后,调用此函数
+	 * 此函数被Ext.onReady函数调用,然后再调用安卓的函数
+	 */
+	function loadPage(){
+		try{
+			if(AndroidObj){
+				AndroidObj.loadPage();
+			}
+		}catch(e){
+			
+		}
+	}
+	/**
+	 * 添加或查询质量监测(提供给外部调用,如android端)
+	 * @param id 质量监测记录的id,如果为空则表示为添加
+	 */
+	function addQualityMonitoringEntrance(id){
+		addQualityMonitoring(id);
+	}
+	
+	/**
+	 * 设置用户信息,提供给外部调用
+	 * @param userName 用户名,工号
+	 * @param userFullName 用户姓名全名
+	 */
+	function setLogonUserInfo(userNameArg,userFullNameArg){
+		Ext.getCmp("createUserName").setValue(userFullNameArg);
+		return "设置登记人信息成功";
+	}
+	
+	/**
+	 * Android端返回至列表页面
+	 */
+	function backToAndroidListPage() {
+		try{
+			if(AndroidObj){
+				AndroidObj.backToListPage();
+			}
+		}catch(e){
+			
+		}
+	}
+
+	/**
+	 * 调用Android端播放语音
+	 * @param content 播放语音的内容
+	 */
+	function speakContentThrouhtAndroid(content) {
+		try{
+			if(AndroidObj){
+				AndroidObj.speakContent(content);
+			}
+		}catch(e){
+			
+		}
+	}
+	
+	/**
+	 * 接收到所扫描的条码参数(通常来自嵌入端,比如android)
+	 */
+	function receiveScannedDeviceBarcode(barcode){
+		try{
+			//speakContentThrouhtAndroid("质量监测前端页面收到传入的条码为" + barcode);
+			if(AndroidObj){
+				AndroidObj.backToListPage();
+			}
+		}catch(e){
+			
+		}
+	}
+
+	/**
+	 * 隐藏文件上传控件(通常来自嵌入端,比如android,因为文件上传控件在android的webview嵌入的页面里不兼容不支持)
+	 */
+	function hideInputFile(){
+		
+	}
 </script>
 <script type="text/javascript" src="qualitymonitoringInstanceForm.js?version=${svnRevision}"></script>
 
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
===================================================================
diff -u -r41172 -r41185
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41172)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41185)
@@ -1422,7 +1422,7 @@
  * @param id
  */
 function addRoutineMonitoring(id, sterilerConfirm) {
-	if (id != null && id != '') {
+	if (id != null && id != '' && id != 0) {
 		Ext.getCmp('formName').addClass("fieldReadOnlyNoRemove");
 		Ext.Ajax.request({
 			url: WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!loadQualityMonitoringInstance.do',
@@ -1927,8 +1927,21 @@
 	if (top.Ext.getCmp('routineMonitoringWin')) {
 		top.Ext.getCmp('routineMonitoringWin').close();
 	}
+	try{
+		backToAndroidListPage();
+	}catch(e){
+		
+	}
 }
 
 function isLoadIframe() {
 	return true
-}
\ No newline at end of file
+}
+
+Ext.onReady(function () {
+	try{
+		loadPage();
+	}catch(e){
+		
+	}
+});
\ No newline at end of file