Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/SyncOperationReservation_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/SyncOperationReservation_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/SyncOperationReservation_Mapper.xml	(revision 41534)
@@ -0,0 +1,63 @@
+<?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_NAME" property="operationName" jdbcType="VARCHAR"/>
+		<result  column="REAL_ROOM_NO" property="operatingRoom" jdbcType="VARCHAR"/>
+		<result  column="SURGEON" property="doctors" jdbcType="VARCHAR"/>
+		<result  column="SCHEDULED_DATE_TIME" property="operationTime" jdbcType="TIMESTAMP"/>
+		<result  column="SCHEDULE_ID" property="scheduleId" jdbcType="VARCHAR"/>
+		<result  column="BQMC" property="depart" jdbcType="VARCHAR"/>
+		<result  column="NAME" property="patientName" jdbcType="VARCHAR"/>
+		<result  column="PATIENT_ID" property="hospitalNumber" jdbcType="VARCHAR"/>
+		<result  column="OPERROOM_CHECK_NURSE" property="washHandNurse" jdbcType="VARCHAR"/>
+		<result  column="USER_NAME" property="circuitNurse" jdbcType="VARCHAR"/>
+		<result  column="CONSOLE_NAME" property="consoleName" jdbcType="VARCHAR"/>
+		<result  column="needTranscoding" property="needTranscoding" jdbcType="VARCHAR"/>
+		<result  column="DATE_OF_BIRTH" property="patientAge" jdbcType="VARCHAR"/>
+		<result  column="SEX" property="patientSex" jdbcType="VARCHAR"/>
+		<result  column="BRLB" property="operationType" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+<!-- 按手术时间查找手术预约单-->
+ <select id="findSyncOperationReservationByTimes" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*,'' needTranscoding
+	FROM SY.V_MED_OPERATION_STERILE 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.SCHEDULED_DATE_TIME
+	]]>
+  </select>
+  
+	<!-- 按申请单单号集合查找申请单-->
+   <select id="findSyncOperationReservationBySerialNumbers" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*,'' needTranscoding
+	FROM SY.V_MED_OPERATION_STERILE 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>
+</mapper>
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r40302 -r41534
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 40302)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 41534)
@@ -1127,8 +1127,12 @@
 			}
 			//2、创建手术预约申请单
 			OperationReservation operationReservation = new OperationReservation();
+			//申请科室,结算科室：优先取视图上的科室名称，目前就ZSYK存在多个手术室的情况
+			String depart = syncOperationReservation.getDepart();
 			//申请科室,结算科室：通过在config.js里面设申请科室名称获得
-			String depart = CssdUtils.getSystemSetConfigByName("operationReservationDepartName");
+			if(StringUtils.isBlank(depart)){
+				depart = CssdUtils.getSystemSetConfigByName("operationReservationDepartName");
+			}
 			OrgUnit operationOrgUnit = (OrgUnit)objectDao.getBySql(OrgUnit.class.getSimpleName(), "where name='" + depart + "'");
 			if(operationOrgUnit != null){
 				operationReservation.setDepartCoding(operationOrgUnit.getOrgUnitCoding());
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HIS.xml
===================================================================
diff -u -r28112 -r41534
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HIS.xml	(.../HIS.xml)	(revision 28112)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HIS.xml	(.../HIS.xml)	(revision 41534)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
@@ -105,5 +105,28 @@
             </bean>
        </property>
     </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:@//192.168.168.126:1521/docare" />  
+   	    <property name="user" value="sy" />  
+        <property name="password" value="sy" />
+    </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="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/zsykzx/interfaces/mybatis/SyncOperationReservation_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+            </bean>
+       </property>
+    </bean>	
+    
 </beans>
\ No newline at end of file