Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 27968)
@@ -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.SyncOrgUnitAndUserDao">
+  
+  <!-- 获取所有部门 -->
+  <select id="getAllOrgUnit" resultType="OrgUnitVo">
+  <![CDATA[
+	select name,coding,parentCoding 
+from srhis.VIEW_CSSD_DEPARTMENT
+	]]>
+  </select>
+  
+  <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+  select name,coding,orgunitcoding
+from srhis.VIEW_CSSD_USER
+	]]>
+  </select>
+</mapper>
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 27968)
@@ -0,0 +1,43 @@
+<?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 hospitalNumber,
+			 hospitalSerialNumber serialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 surgeryName,
+			 patientArea,
+			 roomNumber,
+			 bedNumber
+	   from  PatientAdmissionInfo
+	   where hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+      select hospitalNumber,
+			 hospitalSerialNumber serialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 surgeryName,
+			 patientArea,
+			 roomNumber,
+			 bedNumber
+	   from  PatientAdmissionInfo
+	   where hospitalNumber = #{hospitalNumber}
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/dataSyncConfig.json	(revision 27968)
@@ -0,0 +1,15 @@
+{
+	"同步组织机构":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false
+	},
+	"同步用户":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false,
+		"默认角色ID":[
+			"ROLE_sqry_0"
+		]
+	}
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/applicationContext-his-gzs12rmyy.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/applicationContext-his-gzs12rmyy.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/applicationContext-his-gzs12rmyy.xml	(revision 27968)
@@ -0,0 +1,97 @@
+<?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/gzs12rmyy/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="baseDataDao" class="com.forgon.disinfectsystem.mq.dao.gzs12rmyy.MQDataDaoImpl"></bean>
+ 
+    <!-- his新视图的数据源 -->
+    <bean id="hisDataSourceNewView" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.2.133:1521/clinicdb" />  
+        <property name="user" value="usr_nhis2gys" />  
+        <property name="password" value="nhis2gys" />
+    </bean>
+ 
+ 	<!-- 住院病人(入院病人)主数据源:patientAdmissionInfo表 -->
+    <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="dataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+
+	<!-- 门诊病人(挂号病人)主数据源:patientAdmissionInfo表 -->    
+    <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="dataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="findPatientInfoByHospitalNumDao2" 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="hisDataSourceNewView" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperNew.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="findPatientInfoByTreatmentNumDao2" 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="hisDataSourceNewView" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapperNew.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/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 27968)
@@ -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.FindPatientInfoByTreatmentNumDao">
+
+  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  	<![CDATA[
+	 select hospitalNumber,
+			 hospitalSerialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 surgeryName,
+			 patientArea,
+			 roomNumber,
+			 bedNumber,
+			 inDate
+	  from  PatientAdmissionInfo
+	  where treatmentNum = #{treatmentNum}
+
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml	(revision 27968)
@@ -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.FindPatientInfoByTreatmentNumDao">
+
+  <!-- 按门诊号查找病人信息 -->
+  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  <![CDATA[
+	 select clinicNumber clinicNumber,
+       		 serialNumber serialNumber,
+       		 patientName patientName,
+       		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_clinic
+     where clinicNumber = #{treatmentNum}
+
+]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperNew.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperNew.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperNew.xml	(revision 27968)
@@ -0,0 +1,52 @@
+<?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 hospitalNumber hospitalNumber,
+       		 searialNumber serialNumber,
+       		 patientName patientName,
+      		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
+	    order by in_date desc
+	]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+      select hospitalNumber hospitalNumber,
+       		 searialNumber serialNumber,
+       		 patientName patientName,
+      		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
+	    order by in_date desc
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/timer.xml	(revision 27968)
@@ -0,0 +1,53 @@
+<?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="timingSyncMqPatientInfoTimer" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="dataSynchronizationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>syncMqPatientInfo</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingSyncMqPatientInfoTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncMqPatientInfoTimer" />
+		</property>
+		<property name="cronExpression">
+		<value>0 0/10 * * * ?</value>
+		</property>
+	</bean>
+	
+	<!-- 每天0时0分0秒触发 -->
+	<bean id="timingSyncMqDepartmentAndUserInfoTimer" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="dataSynchronizationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>syncOrgUnitAndUser</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingSyncMqDepartmentAndUserInfoTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncMqDepartmentAndUserInfoTimer" />
+		</property>
+		<property name="cronExpression">
+		<value>0 0 0 * * ?</value>
+		</property>
+	</bean>
+	
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+             	<!-- 每10分触发：定时同步入院病人、挂号病人 -->
+                <ref bean="timingSyncMqPatientInfoTimerTask"/>
+                <ref bean="timingSyncMqDepartmentAndUserInfoTimerTask"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file