Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
===================================================================
diff -u -r22962 -r24155
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 22962)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 24155)
@@ -295,11 +295,10 @@
 		int successCount = 0;
 		try {
 			if (StringUtils.isNotBlank(serialNumbers)) {
-				JSONObject res = new JSONObject();
 					String[] serialNumberarry = serialNumbers.split(Constants.IDS_SEPARATOR);
 					List<String> serialNumberList = Arrays.asList(serialNumberarry);
 					//开始手动同步
-					res=operationReservationManager.syncOperationReservation(serialNumberList);
+					JSONObject res=operationReservationManager.syncOperationReservation(serialNumberList);
 					int total=(int) res.get("total");
 					successCount = (int) res.get("successCount");
 					int	failureCount = (int) res.get("failureCount");
@@ -324,27 +323,27 @@
 		} catch (Exception e) {
 			message = "同步失败";
 			e.printStackTrace();
+			StrutsResponseUtils.output(false, e.getMessage());
 		}
-		HttpServletResponse httpServletResponse = StrutsParamUtils.getResponse();
-		httpServletResponse.setCharacterEncoding("UTF-8");
-		try {
-			if(!StringTools.isBlank(error)){
-				if(successCount>0){
-					//有申请单同步失败也有申请单同步成功
-					httpServletResponse.getWriter().print("{success:true,message:'" + message + "',error:'"+error+"',correct:'"+correct+"'}");
-				}else{
-					//全部申请单同步失败
-					httpServletResponse.getWriter().print("{success:false,message:'" + message + "',error:'"+error+"'}");
-				}
-				httpServletResponse.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); //设置失败标识
+		//根据同步成功个数返回成功信息
+		JSONObject result = new JSONObject();
+		boolean success =true;
+		result.put("message", message);
+		if(!StringTools.isBlank(error)){
+			if(successCount>0){
+				//部分同步成功
+				result.put("error", error);
+				result.put("correct", correct);
 			}else{
-				//全部申请单同步成功
-				//httpServletResponse.getWriter().print("{success:true,message:'" + message +"'}");
-				httpServletResponse.getWriter().print("{success:true,message:'" + message + "',correct:'"+correct+"'}");
+				//全部申请单同步失败
+				result.put("error", error);
+				success = false;
 			}
-		} catch (IOException e) {
-			e.printStackTrace();
+		}else{
+			//全部同步成功
+			result.put("correct", correct);
 		}
+		StrutsResponseUtils.output(success, result);
 	}
 	
 	/**
Index: ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml
===================================================================
diff -u -r24152 -r24155
--- ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml	(.../SyncOperationReservation_Mapper.xml)	(revision 24152)
+++ ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml	(.../SyncOperationReservation_Mapper.xml)	(revision 24155)
@@ -7,10 +7,9 @@
 	<resultMap id="queryForListMap" type="com.forgon.disinfectsystem.inventorymanagement.model.HrpInvoicePlan">
 		<result  column="ID" property="serialNumber" jdbcType="VARCHAR"/>
 		<result  column="OPERATION" property="operationName" jdbcType="VARCHAR"/>
-		<result  column="OPERATING_ROOM_NAME" property="operatingRoom" jdbcType="VARCHAR"/>
+		<result  column="OPROOMLD" property="operatingRoom" jdbcType="VARCHAR"/>
 		<result  column="SURGEON" property="doctors" jdbcType="VARCHAR"/>
 		<result  column="SCHEDULED_DATE_TIME" property="operationTime" jdbcType="DATE"/>
-		<result  column="CONSOLE_NAME" property="consoleName" jdbcType="VARCHAR"/>
 		<result  column="SCHEDULE_ID" property="scheduleId" jdbcType="VARCHAR"/>
 		<result  column="DEPT_NAME" property="deptName" jdbcType="VARCHAR"/>
 		<result  column="NAME" property="patientName" jdbcType="VARCHAR"/>
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js
===================================================================
diff -u -r24145 -r24155
--- ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 24145)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 24155)
@@ -181,18 +181,16 @@
     						url : WWWROOT + '/disinfectsystem/operationReservationAction!saveSyncOperationReservation.do',
     						params : {serialNumber : serialNumber},
     						success : function(response, options) {
+    							//console.log(response.responseText);
     							var result = Ext.decode(response.responseText);
-    								top.Ext.Msg.alert('成功',result.message+"<br/>"+result.correct);
-    							//showResult(result.message);
-    						   sycGridPanelStore.reload();
-    						},
-    						failure : function(response, options) {
-//    							console.log(response.responseText);
-    							var result = Ext.decode(response.responseText);
     							if(result.success){
-    								top.Ext.Msg.alert('失败',result.message+"<br/>"+result.error+"<br/>"+result.correct);   
+    								if(result.data.error){
+    									top.Ext.Msg.alert('成功',resultdata.message+"<br/>"+result.data.error+"<br/>"+result.correct);   
+    								}else{
+    									top.Ext.Msg.alert('成功',result.data.message+"<br/>"+result.data.correct);
+    								}
     							}else{
-    								top.Ext.Msg.alert('失败',result.message+"<br/>"+result.error);   
+    								top.Ext.Msg.alert('失败',result.data.message+"<br/>"+result.data.error+"<br/>");   
     							}
     							sycGridPanelStore.reload();
     						}