Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 28573)
@@ -0,0 +1,37 @@
+<?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.datasynchronization.dao.FindPatientInfoByHospitalNumDao">
+  
+  <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
+  <![CDATA[
+	SELECT h.hospitalNumber as patientNumber,
+        	h.patientName as patientName,
+	        h.patientAge as patientAge,
+	        h.patientSex as patientSex,
+	        h.patientIDCard as patientIDCard,
+	        h.doctorName as doctorName,
+	        h.operation as operation
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+	SELECT h.hospitalNumber as patientNumber,
+        	h.patientName as patientName,
+	        h.patientAge as patientAge,
+	        h.patientSex as patientSex,
+	        h.patientIDCard as patientIDCard,
+	        h.doctorName as doctorName,
+	        h.operation as operation
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 28573)
@@ -0,0 +1,28 @@
+<?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.datasynchronization.dao.SyncOrgUnitAndUserDao">
+  
+  <!-- 获取所有部门 -->
+  <select id="getAllOrgUnit" resultType="OrgUnitVo">
+  <![CDATA[
+	SELECT deptcode as coding,
+        	deptname as name,
+	        parentCoding as parentCoding
+	FROM cssd_department
+	where deptcode != '0'
+	]]>
+  </select>
+  
+  <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+	SELECT usercode as coding,
+        	username as name,
+	        deptcode as orgUnitCoding
+	FROM CSSD_User
+	ORDER BY deptcode
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 28573)
@@ -0,0 +1,22 @@
+<?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.datasynchronization.dao.FindPatientInfoByTreatmentNumDao">
+  
+  <!-- 按门诊号查找病人信息 -->
+  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  <![CDATA[
+	SELECT h.clinicNumber as patientNumber,
+        	h.patientName as patientName,
+	        h.patientAge as patientAge,
+	        h.patientSex as patientSex,
+	        h.patientIDCard as patientIDCard,
+	        '' as doctorName,
+	        '' as operation
+	FROM CSSD_ClinicNumber h
+	WHERE h.clinicNumber = #{treatmentNum}
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/timer.xml	(revision 28573)
@@ -0,0 +1,77 @@
+<?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>
+	<!-- 定时自动签收发货单 -->
+	<bean id="timingAutoSignInvoiceJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="invoiceManager" />
+		</property>
+		<property name="targetMethod">
+			<value>timingAutoSignInvoice</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingAutoSignInvoiceJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingAutoSignInvoiceJob" />
+		</property>
+		<property name="cronExpression">
+			<value>0 0 2 * * ?</value>
+		</property>
+	</bean>
+	
+	<!-- 定时自动结算一次性物品库-->
+	<bean id="autoCopyDisposableGoodsStockJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="stockTakeRecordManager" />
+		</property>
+		<property name="targetMethod">
+			<value>autoCopyDisposableGoodsStock</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="autoCopyDisposableGoodsStockJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="autoCopyDisposableGoodsStockJob" />
+		</property>
+		<property name="cronExpression">
+			<value>0 0 0 * * ?</value>
+		</property>
+	</bean>
+	
+	<!-- 每日8点更新合同预警状态-->
+	<bean id="updateContractWarningStatusStockJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="contractManager" />
+		</property>
+		<property name="targetMethod">
+			<value>updateContractWarningStatus</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="updateContractWarningStatusJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="updateContractWarningStatusStockJob" />
+		</property>
+		<property name="cronExpression">
+			 <value>0 0 8 * * ?</value>
+			<!--<value>0 0/1 * * * ?</value>-->
+		</property>
+	</bean>
+	
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+                <ref bean="timingAutoSignInvoiceJobTrigger"/>
+                <ref bean="autoCopyDisposableGoodsStockJobTrigger"/>
+                <ref bean="updateSupplierWarningStatusTimerTask"/>
+                <ref bean="updateContractWarningStatusJobTrigger"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/applicationContext-his-gzfdzl.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/applicationContext-his-gzfdzl.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/spring/gzfdzl/applicationContext-his-gzfdzl.xml	(revision 28573)
@@ -0,0 +1,83 @@
+<?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"
+	   xmlns:aop="http://www.springframework.org/schema/aop"
+	   xmlns:tx="http://www.springframework.org/schema/tx"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
+           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+	   default-autowire="byName" default-lazy-init="true">
+
+	<!-- his系统数据库相关注入 -->
+	
+	<context:component-scan base-package="com.forgon.disinfectsystem.datasynchronization.service.*" />
+	 
+    <bean id="dataSynchronizationManagerTarget"
+        class="com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManagerImpl" >
+		<property name="config" >
+            <bean class="com.forgon.tools.json.JsonObjectFromResourceFactoryBean">
+                <property name="resource" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzfdzl/interfaces/dataSyncConfig.json" />
+                <property name="charset" value="UTF-8" />
+            </bean>
+        </property>
+	</bean>
+    
+    <bean id="dataSynchronizationManager"
+         parent="txProxyTemplate">
+        <property name="target">
+            <ref local="dataSynchronizationManagerTarget" />
+        </property>
+    </bean>
+    
+    <bean id="dataSynchronizationTableManager"
+        class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
+    </bean>
+    
+    <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
+        <property name="jdbcUrl" value="jdbc:sqlserver://192.168.1.254:1433;databaseName=fdyyhis" />  
+        <property name="user" value="his" />  
+        <property name="password" value="manager" />
+    </bean>
+    
+    
+    
+    <!-- 由MyBatis实现访问HIS数据的Dao接口-->
+    <bean id="syncOrgUnitAndUserDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzfdzl/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="findPatientInfoByHospitalNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzfdzl/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/interfaces/dataSyncConfig.json	(revision 28573)
@@ -0,0 +1,15 @@
+{
+	"同步组织机构":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false
+	},
+	"同步用户":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false,
+		"默认角色ID":[
+			"ROLE_sqry_0"
+		]
+	}
+}
\ No newline at end of file