Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r25034 -r25159
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 25034)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 25159)
@@ -17,6 +17,7 @@
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
@@ -54,6 +55,7 @@
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
+import com.forgon.tools.json.DateJsonValueProcessor;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
@@ -445,15 +447,22 @@
 						}
 					}
 					OperationReservationVo vo = new OperationReservationVo();
-					vo.setConsoleName(or.getConsoleName());
-					vo.setApplicationItems(or.getApplicationItems());
+					vo.setConsoleName(or.getConsoleName());//手术台次
+					vo.setApplicationItems(or.getApplicationItems());//手术器械包集合
+					vo.setOperatingRoom(or.getOperatingRoom());//手术间
+					vo.setPatientName(or.getPatientName());//病人名称
+					vo.setDeptName(or.getDeptName());//病区
+					vo.setDoctors(or.getDoctors());//手术医生
+					vo.setOperationName(or.getOperationName());//手术名称
 					vos.add(vo);
 				}
 			}
 		}
+		Collections.sort(vos);//排序
 		JSONObject json = JSONUtil.buildJsonObject(true,JSONArray.fromObject(vos));
+		JSONUtil.addProperty(json,"totoal", vos.size());//总数
 		if(date != null){
-			JSONUtil.addProperty(json, "operationTime", date);
+			JSONUtil.addProperty(json, "operationTime", date);//手术时间
 		}
 		return json;
 	}
@@ -661,6 +670,12 @@
 	private JSONObject syncAndSaveOperationReservation(List<HrpInvoicePlan> invoicePlanList) {
 		JSONObject resultObject = new JSONObject();
 		if (CollectionUtils.isNotEmpty(invoicePlanList)) {
+			//0、记录日志
+			JsonConfig jsonConfig = new JsonConfig();
+			jsonConfig.registerJsonValueProcessor(java.util.Date.class, new DateJsonValueProcessor("yyyy-MM-dd HH:mm:ss"));
+			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_OPERATION_RESERVATION, Log.TYPE_ADD, 
+					"开始手术预约申请单同步:"+ JSONArray.fromObject(invoicePlanList,jsonConfig));
+			//1、开始同步
 			List<String> successDetail = new ArrayList<String>();
 			List<String> failureDetail = new ArrayList<String>();
 			for (HrpInvoicePlan syncOperationReservation : invoicePlanList) {
@@ -744,7 +759,7 @@
 			resultObject.put("successDetail", successDetail.toString());
 			resultObject.put("failureCount", failureDetail.size());
 			resultObject.put("failureDetail", failureDetail.toString());
-			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_SYNC, Log.TYPE_ADD, "手术预约申请单同步:"+resultObject);
+			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_OPERATION_RESERVATION, Log.TYPE_ADD, "结束手术预约申请单同步:"+resultObject);
 			logger.debug("手术预约申请单同步："+resultObject);
 		}
 		return resultObject;
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationVo.java
===================================================================
diff -u -r18610 -r25159
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationVo.java	(.../OperationReservationVo.java)	(revision 18610)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationVo.java	(.../OperationReservationVo.java)	(revision 25159)
@@ -4,10 +4,11 @@
 import java.util.List;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 
-public class OperationReservationVo {
+public class OperationReservationVo implements  Comparable<OperationReservationVo>{
 	/**
 	 * 手术台次
 	 */
@@ -16,7 +17,68 @@
 	 * 申请的物品
 	 */
 	private List<PrintItemVo> applicationItems = new ArrayList<>();
+	/**
+	 * 病人姓名
+	 */
+	private String patientName;
+	/**
+	 * 手术间
+	 */
+	private String operatingRoom;
+	/**
+	 * 医生
+	 */
+	private String doctors;
+	/**
+	 * 手术名称
+	 */
+	private String operationName;
+	/**
+	 * 科室(病区)名称
+	 */
+	private String deptName;
 	
+	
+	public String getDeptName() {
+		return deptName;
+	}
+
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+
+	public String getPatientName() {
+		return patientName;
+	}
+
+	public void setPatientName(String patientName) {
+		this.patientName = patientName;
+	}
+
+	public String getOperatingRoom() {
+		return operatingRoom;
+	}
+
+	public void setOperatingRoom(String operatingRoom) {
+		this.operatingRoom = operatingRoom;
+	}
+
+	public String getDoctors() {
+		return doctors;
+	}
+
+	public void setDoctors(String doctors) {
+		this.doctors = doctors;
+	}
+
+	public String getOperationName() {
+		return operationName;
+	}
+
+	public void setOperationName(String operationName) {
+		this.operationName = operationName;
+	}
+
 	public String getConsoleName() {
 		return consoleName;
 	}
@@ -63,4 +125,23 @@
 			this.tousseType = tousseType;
 		}
 	}
+
+	/**
+	 * 按手术台次排序(升序)
+	 */
+	@Override
+	public int compareTo(OperationReservationVo arg0) {
+		String thizConsoleName = this.getConsoleName();
+		String argConsoleName = arg0.getConsoleName();
+		if(StringUtils.isBlank(thizConsoleName)||StringUtils.isBlank(argConsoleName)){
+			if(StringUtils.isBlank(thizConsoleName) && StringUtils.isBlank(argConsoleName)){
+				return 0;
+			}else if(StringUtils.isBlank(thizConsoleName)){
+				return -1;
+			}else{
+				return 1;
+			}
+		}
+		return  thizConsoleName.compareTo(argConsoleName);
+	}
 }