Index: ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml
===================================================================
diff -u -r25254 -r25437
--- ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml	(.../timer.xml)	(revision 25254)
+++ ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml	(.../timer.xml)	(revision 25437)
@@ -17,6 +17,7 @@
     <value>2:18:59</value> 
     则为:同步 (今天减1天)昨天的8:23 至 (今天加2天)后天的18:59 手术时间的手术预约申请单-->
    <!-- 手术预约定时同步定时器 -->
+    <!-- 每天15:40分触发 -->
 	<bean id="timingSyncOperationReservationInvoicePlan" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="operationReservationManager" />
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
===================================================================
diff -u -r25407 -r25437
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 25407)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 25437)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 启用标识牌功能
   disableIdCard : false,
   // 回收时科室显示结算科室
@@ -99,9 +99,6 @@
   syncOperation_BuildNewOperationName:true,
   //同步手术预约申请单时，若有匹配不到的手术名，是否允许同步：默认为false不启用
   syncOperation_AllowSyncWhenAnyNoMatchingOperationName:true,
-  //同步手术预约申请单时，若系统已有相同的申请单号，是否允许同步：默认为false不启用
-  //若为true：会把该同步申请单的单号改为：同步申请单号+系统自生成的单号。进行同步
-  syncOperation_AllowSyncWhenAnyMatchingSyncSerialNumber:true,
   //是否启用手术间管理界面
   enableOperationRoomManagerViwe : true,
   // 是否显示装配界面的打印按钮
@@ -152,20 +149,6 @@
   isHideBtnBatchAddTousse:true,
   //是否显示核对人
   showInvoiceAssistantSender:false,
-  //是否显示设备接口菜单（true:不显示 false:显示）
-  disableDeviceInterface : false,
   //是否开启根据科室加载模板
-  isOpenLoadTemplateByUnit:true,
-  //器械包预警时间是否只考虑日期而不用考虑时分秒,即到了预警期的0时0分0秒时就给予告警(默认为需要考虑时分秒)
-  warningUtilOnlyConsiderDate : true,
-  //失效期为当天(可能失效时间(时分秒)已经过了,但失效日期是今天)的包能否发货
-  validUtilTodayCanInvoice : true,
-  //失效期为当天(可能失效时间(时分秒)已经过了,但失效日期是今天)的包能否使用
-  validUtilTodayCanUse : true,
-  //是否启用快速入框按钮
-  isIntoTheBox:true,
-  //是否启用清点确认按钮
-  isCheckIntoTheBox:true,
-  //一次性物品定义是否启用固定条码
-  isInitiateDisposableGoodsFixedBarcode:true
+  isOpenLoadTemplateByUnit:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
===================================================================
diff -u -r25187 -r25437
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js	(.../printConfig.js)	(revision 25187)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js	(.../printConfig.js)	(revision 25437)
@@ -1477,6 +1477,7 @@
 		operationReservations:operationReservationsConfig
 };
 var printerNameMapping = {
-   '模板-器械标签' : 'Zebra GT800 - EPL (副本 1)',
-   '模板-手术小标签' : 'Zebra GT800 - EPL (副本 2)'
+   '模板-器械标签' : 'Zebra GT800 - EPL',
+   '模板-手术小标签' : 'Zebra GT800 - EPL (副本 1)',
+   '模板-厂家器械' : 'Zebra GT800 - EPL'
 };
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
===================================================================
diff -u -r25346 -r25437
--- ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml	(.../HIS.xml)	(revision 25346)
+++ ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml	(.../HIS.xml)	(revision 25437)
@@ -75,7 +75,7 @@
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="operationReservationDataSource" />
+                <property name="dataSource" ref="hisDataSource" />
                 <property name="mapperLocations" value="classpath:config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
@@ -151,8 +151,4 @@
             </bean>
        </property>
     </bean>
-    
-    <bean id="deviceDataByCommunicationManager"
-		class="com.forgon.disinfectsystem.device.service.MeiYaJieDataManagerImpl">
-	</bean>
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r24189 -r25437
--- ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 24189)
+++ ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 25437)
@@ -8,18 +8,18 @@
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
   select 
-  PATIENT_ID as patientNumber,
-  name as patientName,
-  SEX_CODE as patientSex,
-  patientAge,
-  IDENNO as patientIDCard,
-  SURGEON as doctorName,
-  OPERATION1 as operation,
-  bedNumber,
-  dept_name as  patientArea,
-  opRoomId,
-  operationTime ,'1' needTranscoding
-	 from OperationPatientInfo
+ t. PATIENT_ID as patientNumber,
+ t. name as patientName,
+ t. SEX as patientSex,
+ t. birthday as patientAge,
+ t. DIAG_BEFORE_OPERATION as operation,
+ to_char (t.SCHEDULED_DATE_TIME ,'yyyy-mm-dd hh:mi:ss') as operationTime,
+ t. SURGEON as doctorName,
+ t. scheduled_date_time,
+ t. BED_NO as bedNumber,
+ t. OPERATING_ROOM_NO as opRoomId,
+ t. dept_name as  patientArea ,'1' needTranscoding
+	 from v_operation_schedule t
 	 WHERE PATIENT_ID = #{hospitalNum}
 	order by  scheduled_date_time desc
 	]]>
@@ -29,18 +29,18 @@
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
   select 
-  PATIENT_ID as patientNumber,
-  name as patientName,
-  SEX_CODE as patientSex,
-  patientAge,
-  IDENNO as patientIDCard,
-  SURGEON as doctorName,
-  OPERATION1 as operation,
-  bedNumber,
-  opRoomId,
-  dept_name as  patientArea,
-  operationTime ,'1' needTranscoding
-	 from OperationPatientInfo
+ t. PATIENT_ID as patientNumber,
+ t. name as patientName,
+ t. SEX as patientSex,
+ t. birthday as patientAge,
+ t. DIAG_BEFORE_OPERATION as operation,
+ to_char (t.SCHEDULED_DATE_TIME ,'yyyy-mm-dd hh:mi:ss') as operationTime,
+ t. SURGEON as doctorName,
+ t. scheduled_date_time,
+ t. BED_NO as bedNumber,
+ t. OPERATING_ROOM_NO as opRoomId,
+ t. dept_name as  patientArea ,'1' needTranscoding
+	 from v_operation_schedule t
 	 WHERE PATIENT_ID = #{hospitalNum}
 	order by  scheduled_date_time desc
 	]]>