Index: ssts-web/src/main/resources/spring/projects/xkyy/HERP.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/xkyy/HERP.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/xkyy/HERP.xml	(revision 23625)
@@ -0,0 +1,61 @@
+<?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:tx="http://www.springframework.org/schema/tx" 
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" 
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans    
+           http://www.springframework.org/schema/beans/spring-beans.xsd   
+           http://www.springframework.org/schema/tx     
+           http://www.springframework.org/schema/tx/spring-tx.xsd    
+           http://www.springframework.org/schema/context   
+           http://www.springframework.org/schema/context/spring-context.xsd
+           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd   
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"
+	default-autowire="byName" default-lazy-init="true">
+
+	<!-- 与物资系统的接口的相关Bean -->
+	<context:component-scan base-package="com.forgon.disinfectsystem.inventorymanagement.service.*" />
+    <bean id="inventoryManagerTarget"
+		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
+	</bean>
+    
+    <bean id="inventoryManager"
+		class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager" ref="transactionManager" />
+		<property name="target">
+			<ref bean="inventoryManagerTarget" />
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+    
+    <bean id="inventoryDataSource" 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.100.11:1521:xkhis1" />  
+        <property name="user" value="eqsup" />  
+        <property name="password" value="gzxkgzfj" />
+    </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="inventoryDataSource" />
+                <property name="mapperLocations" value="classpath:config/xkyy/mybatis/syncFromHERP_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <!-- 事务管理器 -->
+    <bean id="inventoryTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="inventoryDataSource" />
+    </bean>
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 23625)
@@ -0,0 +1,27 @@
+<?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 orgunitcoding  as coding,
+        	name as name,
+	        parentid as parentCoding
+	FROM EQSUP_OrgUnit
+	]]>
+  </select>
+  
+  <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+	SELECT name as coding,
+        	fullName as name,
+	        ORGUNIT_ID as orgUnitCoding
+	FROM EQSUP_Users
+	ORDER BY ORGUNIT_ID
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 23625)
@@ -0,0 +1,20 @@
+<?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">
+	SELECT h.hospitalNumber as patientNumber,
+        	h.patientName as patientName,
+	        h.patientAge as patientAge,
+	        h.patientIDCard as patientIDCard,
+	        '' as doctorName,
+	        '' as operation,
+            h.patientSex as patientSex 
+	FROM EQSUP_HospitalNumber h
+	WHERE h.hospitalNumber = #{treatmentNum}
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 23625)
@@ -0,0 +1,20 @@
+<?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">
+	SELECT h.clinicNumber as patientNumber,
+        	h.patientName as patientName,
+	        h.patientAge as patientAge,
+	        h.patientIDCard as patientIDCard,
+	        '' as doctorName,
+	        '' as operation,
+            h.patientSex as patientSex 
+	FROM EQSUP_ClinicNumber h
+	WHERE h.clinicNumber = #{treatmentNum} 
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/dataSyncConfig.json	(revision 23625)
@@ -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/resources/spring/projects/xkyy/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/xkyy/timer.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/xkyy/timer.xml	(revision 23625)
@@ -0,0 +1,34 @@
+<?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 1 * * ?</value><!-- 每天的凌晨1点钟触发自动签收-->
+		</property>
+	</bean>
+
+	<!-- 任务调度配置 -->
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+                <ref bean="timingAutoSignInvoiceJobTrigger"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/mybatis/syncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/mybatis/syncFromHERP_Mapper.xml	(revision 23625)
@@ -0,0 +1,138 @@
+<?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 as serialNumber,
+        	time as time,
+	        remark as remark
+	FROM eqsup_materialentry
+	WHERE serialnumber = #{inEntrySerialNumber}
+	]]>
+  </select>
+  
+  <!-- 按时间查找入库单 -->
+  <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialnumber as serialNumber,
+        	time as time,
+	        remark as remark
+	FROM eqsup_materialentry
+	WHERE 1=1 
+	]]>
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= to_date(to_char(#{endDate},'yyyy-mm-dd') || ' 23:59:59','yyyy-MM-dd hh24:mi:ss')
+		]]>
+	</if>
+	ORDER BY time
+
+  </select>
+  
+  <!-- 按单号查找入库单明细 -->
+  <select id="findInEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  t.materialdefinition_id AS inventorySerialNumber,
+			s.companyname AS supplierName,
+	        t.batchno AS batchNumber,
+	        t.expdate AS expDate,
+	        t.amount AS amount,
+	        t.cost AS unitPrice
+	FROM eqsup_materialentryitem t 
+	LEFT JOIN eqsup_supplier s ON 
+	t.supplier_id = s.id 
+	WHERE t.materialentry_id in ( SELECT em.id  FROM eqsup_materialentry em where em.serialnumber = #{inEntrySerialNumber})
+	]]>
+  </select>
+  
+  <!-- 按物资编码查找物资信息 -->
+  <select id="getInventory" resultType="Inventory">
+  	<![CDATA[
+	SELECT id AS serialNumber,
+	       name AS name,
+	       spec AS specification,
+	       typeno AS category,
+	       unit AS unit,
+	       null AS cost
+	FROM eqsup_materialdefinition 
+	WHERE id = #{inventorySerialNumber}
+	]]>
+  </select>
+  
+   <!-- 按名称规格查找物资信息 -->
+  <select id="findInventory" resultType="Inventory">
+	SELECT id AS serialNumber,
+	       name AS name,
+	       spec AS specification,
+	       typeno AS category,
+	       unit AS unit,
+	       null AS cost
+	FROM eqsup_materialdefinition
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND spec = #{specification}
+		</when >
+		<otherwise>
+			AND ((spec is null) OR (spec =''))
+		</otherwise>
+	</choose>
+  </select>
+  
+  <!-- 按单号查找退库单 -->
+   <select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialnumber as serialNumber,
+        	time as time,
+	        remark as remark 
+	FROM eqsup_matoutentry
+	WHERE serialnumber = #{inEntrySerialNumber}
+
+	]]>
+  </select>
+  
+  <!-- 按时间查找退库单 -->
+  <select id="findOutEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialnumber as serialNumber,
+        	time as time,
+	        remark as remark 
+	FROM eqsup_matoutentry
+	WHERE 1=1 
+	]]>
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= to_date(to_char(#{endDate},'yyyy-mm-dd') || ' 23:59:59','yyyy-MM-dd hh24:mi:ss')
+		]]>
+	</if>
+	ORDER BY make_date  
+  </select>
+  
+  <!-- 按单号查找退库单明细 -->
+  <select id="findOutEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  t.materialdefinition_id AS inventorySerialNumber,
+			s.companyname AS supplierName,
+	        t.batchno AS batchNumber,
+	        t.expdate AS expDate,
+	        t.amount AS amount,
+	        t.cost AS unitPrice,
+	        materialdefinition_id AS invCode
+	FROM eqsup_matoutentryitem t 
+	LEFT JOIN eqsup_supplier s  
+	on t.supplier_id = s.id 
+	WHERE t.materialentry_id in ( SELECT em.id  FROM eqsup_matoutentry em where em.serialnumber = #{entrySerialNumber})
+	]]>
+  </select>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/xkyy/mybatis/SyncSupplierMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/xkyy/mybatis/SyncSupplierMapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/xkyy/mybatis/SyncSupplierMapper.xml	(revision 23625)
@@ -0,0 +1,14 @@
+<?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.SyncSupplierDao">
+  
+  <!-- 获取所有供货单位、生产厂家、外来器械租用商 -->
+  <select id="getAllSupplier" resultType="Supplier">
+  <![CDATA[
+        SELECT companyName AS companyName, '' AS rentTousse FROM EQSUP_Supplier
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/xkyy/HIS.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/xkyy/HIS.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/xkyy/HIS.xml	(revision 23625)
@@ -0,0 +1,108 @@
+<?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:tx="http://www.springframework.org/schema/tx" 
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" 
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans    
+           http://www.springframework.org/schema/beans/spring-beans.xsd   
+           http://www.springframework.org/schema/tx     
+           http://www.springframework.org/schema/tx/spring-tx.xsd    
+           http://www.springframework.org/schema/context   
+           http://www.springframework.org/schema/context/spring-context.xsd
+           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd   
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.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="config/xkyy/dataSyncConfig.json" />
+                <property name="charset" value="UTF-8" />
+            </bean>
+        </property>
+	</bean>
+    
+    <bean id="dataSynchronizationManager"
+        class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+        <property name="transactionManager" ref="transactionManager" />
+        <property name="target">
+            <ref bean="dataSynchronizationManagerTarget" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED,-Exception</prop>
+            </props>
+        </property>
+    </bean>
+    
+    <bean id="dataSynchronizationTableManager"
+        class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
+    </bean>
+    
+    
+    <bean id="hisDataSource"
+        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.100.11:1521:xkhis1" />  
+        <property name="user" value="eqsup" />  
+        <property name="password" value="gzxkgzfj" />  
+    </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="classpath:config/xkyy/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="classpath:config/xkyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <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="classpath:config/xkyy/mybatis/SyncOrgUnitAndUserMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="syncSupplierDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncSupplierDao" />  
+        <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="classpath:config/xkyy/mybatis/SyncSupplierMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.entity.basedatamanager.supplier" />
+            </bean>
+       </property>
+    </bean>
+    
+</beans>
\ No newline at end of file