Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 28778)
@@ -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 patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        '' doctorName,
+	        '' 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/gdszyy/interfaces/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/dataSyncConfig.json	(revision 28778)
@@ -0,0 +1,15 @@
+{
+	"同步组织机构":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false
+	},
+	"同步用户":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false,
+		"默认角色ID":[
+			"ROLE_1_0"
+		]
+	}
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml	(revision 28778)
@@ -0,0 +1,35 @@
+<?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>
+
+    <!-- 每10分触发 -->
+	<bean id="timingSyncForeignTousseApplicationTimer" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="dataSynchronizationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>syncForeignTousseApplication</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	
+	<bean id="timingSyncForeignTousseApplicationTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncForeignTousseApplicationTimer" />
+		</property>
+		<property name="cronExpression">
+			<value>0 0/10 * * * ?</value>
+		</property>
+	</bean>
+	
+	<bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+		<property name="triggers">
+			<list>
+				<!-- 每10分钟触发：定时同步外来器械包申请单 -->
+				<ref bean="timingSyncForeignTousseApplicationTimerTask"/>
+			</list>
+		</property>
+	</bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 28778)
@@ -0,0 +1,111 @@
+<?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.InventoryDao"> 
+ <!-- 按单号查找入库单 -->
+ <select id="findInEntryBySerialNumber" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+ </select>
+<!-- 按时间查找入库单 -->
+ <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	where 1=1
+	]]> 
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time	 
+  </select>
+<!-- 按单号查找入库单明细 -->
+<select id="findInEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  inventorySerialNumber,
+			batchNumber,
+	        supplierName,
+	        amount,
+	        expDate,
+	        cost AS unitPrice
+	FROM  CSSD_MaterialEntry t1
+	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
+	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,
+	    name,specification,unit
+		FROM CSSD_MaterialDefinition
+		WHERE serialNumber = #{inventorySerialNumber}
+	]]>
+</select> 
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber AS serialNumber,
+	       name,specification,unit
+	FROM CSSD_MaterialDefinition
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND specification = #{specification}
+		</when >
+		<otherwise>
+			AND ((specification is null) OR (specification =''))
+		</otherwise>
+	</choose>
+	]]<name />
+</select> 
+
+<!-- 按单号查找退库单 -->
+<select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+</select> 
+<!-- 按时间查找退库单 -->
+<select id="findOutEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_GodownEntry
+	WHERE 1=1
+	]]>
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time
+ </select> 
+<!-- 按单号查找退库单明细 -->
+<select id="findOutEntryItem" resultType="StorageEntryItem">
+	<![CDATA[
+	SELECT   INVENTORYSERIALNUMBER,
+			BATCHNUMBER,
+	        SUPPLIERNAME,
+	        amount,
+	        EXPDATE,
+	        cost AS unitPrice
+	FROM  CSSD_GodownEntry t1
+	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
+	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+</mapper> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 28778)
@@ -0,0 +1,39 @@
+<?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 patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        h.doctorName doctorName,
+	        h.operation operation,
+	        convert(varchar,h.operationTime,120) operationTime
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+	SELECT h.hospitalNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        h.doctorName doctorName,
+	        h.operation operation,
+	        convert(varchar,h.operationTime,120) operationTime
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(revision 28778)
@@ -0,0 +1,125 @@
+<?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/gdszyy/interfaces/dataSyncConfig.json" />
+                <property name="charset" value="UTF-8" />
+            </bean>
+        </property>
+	</bean>
+    
+    <bean id="dataSynchronizationManager"
+         parent="txProxyTemplate">
+        <property name="target">
+            <ref bean="dataSynchronizationManagerTarget" />
+        </property>
+    </bean>
+    
+    <bean id="dataSynchronizationTableManager"
+        class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
+    </bean>
+    
+    
+    <!-- 定义数据源。根据开发和生产环境需要，设置所用数据源的Bean id 为 hisDataSource -->
+   <!--  <bean id="hisDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />--> 
+        <!-- 本地测试环境配置 -->
+    <!--    <property name="jdbcUrl" value="jdbc:sqlserver://localhost:1433;databaseName=gdszyyhis" />  
+        <property name="user" value="sa" />  
+        <property name="password" value="p2ssword" />
+    </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/gdszyy/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/gdszyy/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/gdszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </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>
+    
+    <bean id="inventoryManager"
+		 parent="txProxyTemplate">
+		<property name="target">
+			<ref bean="inventoryManagerTarget" />
+		</property>
+	</bean>
+	
+	<!-- InventoryDao接口的实现， 由MyBatis实现-->
+    <bean id="inventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" />  
+       <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/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+            </bean>
+       </property>
+    </bean>  
+    
+    <!-- 同步外来器械包申请单的接口(广东中医院) -->
+    <bean id="syncForeignTousseApplicationDao"
+		class="com.forgon.disinfectsystem.datasynchronization.dao.gdszyy.SyncForeignTousseApplicationDaoImpl">
+	</bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 28778)
@@ -0,0 +1,26 @@
+<?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 LTRIM(RTRIM(coding)) coding,LTRIM(RTRIM(name)) name,LTRIM(RTRIM(parentCoding)) parentCoding
+	FROM  dbo.CSSD_Department where coding is not null and len(LTRIM(RTRIM(coding))) > 0
+	and name is not null and len(LTRIM(RTRIM(name))) > 0
+	and coding != '0'
+	]]>
+  </select>
+  
+  <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+	SELECT LTRIM(RTRIM(coding)) coding,LTRIM(RTRIM(name)) name,LTRIM(RTRIM(orgUnitCoding)) orgUnitCoding
+	FROM dbo.CSSD_User where coding is not null and len(LTRIM(RTRIM(coding))) > 0
+	and name is not null and len(LTRIM(RTRIM(name))) > 0
+	ORDER BY coding
+	]]>
+  </select>
+</mapper>
\ No newline at end of file