Index: ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
===================================================================
diff -u -r23822 -r24145
--- ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml	(.../HIS.xml)	(revision 23822)
+++ ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml	(.../HIS.xml)	(revision 24145)
@@ -47,6 +47,14 @@
         <property name="password" value="p2ssword" />
     </bean>
     --> 
+    <!-- his数据源 -->
+	<bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+    	<property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
+      <property name="jdbcUrl" value="jdbc:sqlserver://10.0.0.4:1433;databaseName=cx" />
+        <property name="user" value="cx" />  
+        <property name="password" value="" />
+    </bean>
+    
     <!-- 由MyBatis实现访问HIS数据的Dao接口-->
     <bean id="syncOrgUnitAndUserDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
@@ -84,15 +92,6 @@
        </property>
     </bean>
   
-  
-    <!-- his数据源 -->
-    <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
-    	<property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
-      <property name="jdbcUrl" value="jdbc:sqlserver://10.0.0.4:1433;databaseName=cx" />
-        <property name="user" value="cx" />  
-        <property name="password" value="" />
-    </bean>
-    
    <bean id="inventoryManagerTarget"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
 	</bean>
@@ -116,4 +115,38 @@
             </bean>
        </property>
     </bean>  
+    
+    <!-- 定义手术预约申请单数据源。根据开发和生产环境需要，设置所用数据源的Bean id 为 operationReservationDataSource -->
+    <!-- 本地测试手术预约申请单数据 -->
+    <!-- <bean id="operationReservationDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//localhost:1521/ORCL" />  
+   		<property name="user" value="c##apps" />
+    	<property name="password" value="p2ssword" />
+    </bean> --> 
+    
+    <!-- 手术预约申请单数据源 -->
+    <bean id="operationReservationDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//132.147.200.65:1521/jqzy" />  
+   		<property name="user" value="ygcom" />
+    	<property name="password" value="ygcom" />
+    </bean>
+    
+    <!-- InvoicePlanDao接口的实现， 由MyBatis实现-->
+     <bean id="invoicePlanDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.inventorymanagement.dao.InvoicePlanDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="operationReservationDataSource" />
+                <property name="mapperLocations" value="classpath:config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+            </bean>
+       </property>
+    </bean>
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
===================================================================
diff -u -r23987 -r24145
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 23987)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 24145)
@@ -83,6 +83,14 @@
   useRecordCircuitNurseAllowBlank:true,
   //洗手护士是否允许为空
   useRecordWashHandNurseAllowBlank:true,
+  //启用手术预约功能
+  enableOperationReservation:true,
+  //手术预约科室名称
+  operationReservationDepartName:"手术室",
+  //是否开启手术预约同步按钮,默认为不启用
+  enableSyncOperationReservation:true,
+  //是否启用手术间管理界面
+  enableOperationRoomManagerViwe : true,
   // 是否显示装配界面的打印按钮
   packingView_currentTaskGroup_showPrintBtn: true,
   // 扫描器械包名字来作为标识牌
Index: ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml	(revision 24145)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.forgon.disinfectsystem.inventorymanagement.dao.InvoicePlanDao">
+	<!-- 结果集 -->
+	<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="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"/>
+		<result  column="PATIENT_ID" property="hospitalNumber" jdbcType="VARCHAR"/>
+		<result  column="FIRST_OPERATION_NURSE" property="washHandNurse" jdbcType="VARCHAR"/>
+		<result  column="FIRST_SUPPLY_NURSE" property="circuitNurse" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+<!-- 按手术时间查找手术预约单-->
+ <select id="findSyncOperationReservationByTimes" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*
+	FROM OperationPatientInfo po 
+	WHERE 1=1
+	]]>
+	<if test="startDate != null">
+		and po.SCHEDULED_DATE_TIME >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and po.SCHEDULED_DATE_TIME <= #{endDate}
+		]]>
+	</if>
+	<![CDATA[
+	ORDER BY po.ID
+	]]>
+  </select>
+  
+	<!-- 按申请单单号集合查找申请单-->
+   <select id="findSyncOperationReservationBySerialNumbers" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*
+	FROM OperationPatientInfo po
+	WHERE 1=1
+	]]>
+	<if test="serialNumbers != null and serialNumbers.size>0"> 
+			and po.ID in
+		    <foreach collection="serialNumbers"  item="serialNumber" open="(" separator=", " close=")">
+	             #{serialNumber}       
+	       </foreach>     
+	 </if>
+	<![CDATA[
+	ORDER BY po.SCHEDULED_DATE_TIME
+	]]>
+  </select>	 
+  
+   <!-- 更新单的状态（已没用) -->
+  <update id="updateSyncInvoicePlanState">
+  <![CDATA[
+  update OperationPatientInfo set SYNC_STATUS=#{recordState} where ID=#{serialNumber}
+  ]]>
+  </update>
+  
+ 	<!-- 按时间，同步状态，查找申请单（已没用） --> 
+	<select id="findSyncInvoicePlanByTimeAndRecordState" resultMap="queryForListMap">
+	<![CDATA[ 
+	SELECT  *
+	FROM OperationPatientInfo 
+	WHERE SYNC_STATUS <>#{recordState} or SYNC_STATUS is null 
+	]]>
+	<if test="startDate != null">
+		and SCHEDULED_DATE_TIME >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and SCHEDULED_DATE_TIME <= #{endDate}
+		]]>
+	</if>
+	<![CDATA[
+	ORDER BY ID
+	]]>
+	</select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js
===================================================================
diff -u -r23428 -r24145
--- ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 23428)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 24145)
@@ -116,7 +116,7 @@
 		title : '同步手术预约单',
 		modal : true,
 		border:true ,
-		width : 850,
+		width : 950,
 		height : 660,
 		plain : true,
 		items : [ sycGridPanel ]
Index: ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml	(revision 24145)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+	<!-- 手术预约定时同步定时器 可传参数来设定:需要同步的手术预约申请单的手术时间段-->
+    <!-- 参数规则: 
+     <value>日:小时:分钟</value>(日为:0则默认当天) 
+	第一个参数:手术预约申请单的过滤开始时间 
+	第二个参数:手术预约申请单的过滤结束时间
+	若不填则默认:过滤时间段为昨天到今天
+	例如1:
+	<value>0:8:00</value>  
+    <value>0:18:00</value> 
+    则为:同步 今天的8:00 至 今天的18:00 手术时间的手术预约申请单
+    例如2:
+	<value>-1:8:23</value>  
+    <value>2:18:59</value> 
+    则为:同步 (今天减1天)昨天的8:23 至 (今天加2天)后天的18:59 手术时间的手术预约申请单-->
+   <!-- 手术预约定时同步定时器 -->
+    <!-- 每30分钟触发 -->
+	<bean id="timingSyncOperationReservationInvoicePlan" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="operationReservationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>timingSyncOperationReservation</value>
+		</property>
+		<property name="arguments">
+            <list>
+             <value></value>
+             <value></value>
+            </list>
+        </property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingSyncOperationReservationInvoicePlanTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncOperationReservationInvoicePlan" />
+		</property>
+		<property name="cronExpression">
+		<value>0 0/30 * * * ?</value>
+		</property>
+	</bean>
+	
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+             	<!-- 每30分钟触发：定时同步手术预约单 -->
+                <ref bean="timingSyncOperationReservationInvoicePlanTimerTask"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r23892 -r24145
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 23892)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 24145)
@@ -811,10 +811,10 @@
 			String operationName = operation;//手术预约单手术名字
 			boolean isHaveSecondOperationName = false;//手术单手术名 是否由多个手术名合拼
 //			boolean useSecondOperationName = false;//是否取第二手术名称
-			//手术名通过"+"分割
-			String[] operationArray = operationName.split("\\+");
 			//1、 如果手术名称包含"+"时则有多个手术名称
-			if(operationArray.length > 0){
+			if(operation.indexOf("+") != -1){
+				//手术名通过"+"分割
+				String[] operationArray = operationName.split("\\+");
 				//2-1样式：手术1【+手术2】
 				if(operationArray.length == 2 && operationName.indexOf("【") != -1 && operationName.indexOf("】") != -1){
 					operationNameList.add(StringUtils.substringBefore(operationName, "【")); //第一手术名称
@@ -829,6 +829,10 @@
 				}
 			}else{
 				//只有一个手术名称：获得手术使用器械包明细集合（常用物品与追加物品合并后的物品项）
+				//若以,号结尾则去掉
+				if(operationName.endsWith(",")){
+					operationName = StringUtils.substringBeforeLast(operationName, ",");
+				}
 				//1-1样式： 手术1【xxx】
 				if(operationName.indexOf("【") != -1 && operationName.indexOf("】") != -1){
 					String oName = StringUtils.substringBefore(operationName, "【");//手术名为【前
@@ -844,7 +848,14 @@
 			if(isHaveSecondOperationName && operationNameList.size()>1){
 				List<OperationName> oNameObjectList = new ArrayList<OperationName>();//手术名称对象集合
 				//获取第一个手术名称
-				OperationName firstONameObject = getOperationNameByName(operation,operationNameList.get(0));
+				String firstOName = operationNameList.get(0);
+				//若第一手术名以,号结尾则去掉,号
+				if(firstOName.endsWith(",")){
+					firstOName = StringUtils.substringBeforeLast(firstOName, ",");
+					//把去掉,号后的第一手术名称替换原来的
+					operationNameList.set(0, firstOName);
+				}
+				OperationName firstONameObject = getOperationNameByName(operation,firstOName);
 				//2-1、样式:手术1+手术2。若第一个手术名称的配置是要读取第二个手术名称的物品。则只获得第二手术使用器械包明细集合（常用物品与追加物品合并后的物品项）
 				if(firstONameObject != null && StringUtils.equals(Constants.STR_YES, firstONameObject.getUseSecondOperationItems())){
 					OperationName secondONameObject = getOperationNameByName(operation,operationNameList.get(1));