Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/dataSyncConfig.json	(revision 27973)
@@ -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/gyey/spring/applicationContext-settlementWriteBack-gyey.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-settlementWriteBack-gyey.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-settlementWriteBack-gyey.xml	(revision 27973)
@@ -0,0 +1,26 @@
+<?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">
+
+	<!-- 广医二院结算接口 -->
+	
+    <bean id="settlementWriteBackManagerTarget"
+        class="com.forgon.disinfectsystem.settlement.service.SettlementWriteBackManagerImplForGYEY" >
+	</bean>
+    
+    <bean id="settlementWriteBackManager"
+         parent="txProxyTemplate">
+        <property name="target">
+            <ref bean="settlementWriteBackManagerTarget" />
+        </property>
+    </bean>
+        
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/timer.xml	(revision 27973)
@@ -0,0 +1,96 @@
+<?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>
+
+<!-- 定时发送消息给客户端-->
+	<!-- <bean id="sendMessageToAllClientJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="wsHandler" />
+		</property>
+		<property name="targetMethod">
+			<value>autoSendMessageToAllClient</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="sendMessageToAllClientJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="sendMessageToAllClientJob" />
+		</property>
+		<property name="cronExpression">
+			<value>0 0/1 * * * ?</value>
+		</property>
+	</bean> -->
+
+	<!-- 定时检测心跳-->
+	<bean id="heartbeatTimerManager" class="com.forgon.disinfectsystem.heartbeat.timer.HeartbeatTimerManagerImpl"/>
+	<bean id="checkHeartbeatJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="heartbeatTimerManager" />
+		</property>
+		<property name="targetMethod">
+			<value>checkHeartbeat</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="checkHeartbeatJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="checkHeartbeatJob" />
+		</property>
+		<property name="cronExpression">
+			<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="sendMessageToAllClientJobTrigger"/> -->
+                <ref bean="checkHeartbeatJobTrigger"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/webservice-cxf.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/webservice-cxf.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/webservice-cxf.xml	(revision 27973)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xmlns="http://www.springframework.org/schema/beans"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd" >
+
+    <!-- Import apache CXF bean definition 固定 -->
+
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+
+    <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+    
+	<!-- hl7业务webservice接口 begin... -->
+    <bean id="hL7V2Service" class="com.goodwillcis.HL7V2ServiceImpl" ></bean>
+    <jaxws:endpoint
+        address="/HL7V2Service"
+        implementor="#hL7V2Service" />
+	<!-- hl7业务webservice接口 end... -->
+                
+	<!-- 科室人员接口 begin... -->
+    <bean id="sysUserAndOrgService" class="com.goodwillcis.SysUserAndOrgServiceImpl" ></bean>
+    <jaxws:endpoint
+        address="/SysUserAndOrgService"
+        implementor="#sysUserAndOrgService" />
+	<!-- 科室人员接口 end... -->
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 27973)
@@ -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/gyey/interfaces/mybatis/SyncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/SyncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/SyncFromHERP_Mapper.xml	(revision 27973)
@@ -0,0 +1,93 @@
+<?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 v_gys_interface_stock_in
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+ </select>
+
+<!-- 按时间查找入库单(暂只查昌岗院区,所以增加院区条码为0) -->
+ <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM v_gys_interface_stock_in
+	where 1=1 and hospitalArea = '0'
+	]]> 
+	<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  v_gys_interface_stock_in_detail
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+</select> 
+
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,
+	    name,specification,unit
+		FROM v_gys_interface_item
+		WHERE serialNumber = #{inventorySerialNumber}
+	]]>
+</select> 
+
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT inventorySerialNumber AS serialNumber,
+	       name,specification,unit
+	FROM v_gys_interface_item
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND specification = #{specification}
+		</when >
+		<otherwise>
+			AND ((specification is null) OR (specification =''))
+		</otherwise>
+	</choose>
+	]]>
+</select> 
+
+
+<!-- 按单号查找退库单(因为暂时没有退库业务,所以返回数据都为空) -->
+<select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+	SELECT serialNumber,time,remark
+	FROM v_gys_interface_stock_in where 1=2
+</select> 
+
+<!-- 按时间查找退库单 -->
+<select id="findOutEntryByTime" resultType="StorageEntry">
+  	SELECT serialNumber,time,remark
+	FROM v_gys_interface_stock_in where 1=2
+ </select> 
+
+<!-- 按单号查找退库单明细 -->
+<select id="findOutEntryItem" resultType="StorageEntryItem">
+	SELECT serialNumber,time,remark
+	FROM v_gys_interface_stock_in_detail where 1=2
+</select> 
+</mapper> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/video-monitor.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/video-monitor.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/video-monitor.xml	(revision 27973)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans.xsd" default-autowire="byName">
+
+    <!-- 视频监控系统begin -->
+    <bean id="videoManager"
+		class="com.forgon.disinfectsystem.basedatamanager.videomonitor.service.VideoManagerSynologyImpl">
+		<property name="config" >
+            <bean class="com.forgon.tools.json.JsonObjectFromResourceFactoryBean">
+                <property name="resource" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gyey/interfaces/videoServerConfig.json" />
+                <property name="charset" value="UTF-8" />
+            </bean>
+        </property>
+	</bean>
+	<!-- 视频监控系统end -->
+
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml	(revision 27973)
@@ -0,0 +1,50 @@
+<?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.roomNumber as roomNumber,
+	        h.bedNumber as bedNumber,
+	        h.patientArea as patientArea,
+	        h.visitAmount as visitId,
+	        h.surgeryName as operation
+	FROM PatientAdmissionInfo as h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	and h.surgeryName is not null
+	order by h.id desc
+  	]]>
+  </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.roomNumber as roomNumber,
+	        h.bedNumber as bedNumber,
+	        h.patientArea as patientArea,
+	        h.visitAmount as visitId,
+	        h.surgeryName as operation
+	FROM PatientAdmissionInfo as h
+	WHERE h.hospitalNumber = #{hospitalNum}
+	and h.surgeryName is not null
+	order by h.id desc
+  	]]>
+  </select>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 27973)
@@ -0,0 +1,38 @@
+<?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}
+    ORDER BY h.serialNumber DESC, h.operationTime DESC
+	]]>
+  </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}
+    ORDER BY h.serialNumber DESC, h.operationTime DESC
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/videoServerConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/videoServerConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/videoServerConfig.json	(revision 27973)
@@ -0,0 +1,7 @@
+{
+	"serverConfig": {
+		"apiPath": "http://168.1.99.206:5000/webapi/",
+		"username": "admin",
+		"password": "Gyey@2019"
+	}
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml	(revision 27973)
@@ -0,0 +1,121 @@
+<?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/gyey/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>
+ 
+     <!-- 本地数据(数据来源于集成平台推送过来的hl7住院病人数据) -->
+    <bean id="localDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource"> 
+    	<!-- 需要换成实际现场配置,用户名和密码都用明码 --> 
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
+        <property name="jdbcUrl" value="jdbc:sqlserver://localhost:1433;databaseName=gyeySterile" />  
+        <property name="user" value="sa" />  
+        <property name="password" value="sa" />
+    </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://168.2.99.24:1433;databaseName=zyhis_db" />  
+        <property name="user" value="gys" />  
+        <property name="password" value="fjgys" />
+    </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://localhost:1433;databaseName=gdsy" />  
+        <property name="user" value="sa" />  
+        <property name="password" value="p2ssword" />
+    </bean>	-->
+
+     
+ 	<bean id="mzhisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+        <property name="jdbcUrl" value="jdbc:sqlserver://168.2.99.14:1433;databaseName=mzhis_db" />
+        <property name="user" value="gys" />  
+        <property name="password" value="fjgys" />
+    </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/gyey/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="localDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.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="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gyey/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="mzhisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gyey/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/gyey/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(revision 27973)
@@ -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 deptcode as coding,
+        	deptname as name,
+	        '' as parentCoding
+	FROM cssd_department
+	]]>
+  </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/gyey/spring/inventory.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/inventory.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/inventory.xml	(revision 27973)
@@ -0,0 +1,59 @@
+<?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">
+
+	<!-- 与物资系统的接口的相关Bean -->
+	<context:component-scan base-package="com.forgon.disinfectsystem.inventorymanagement.service.*" />
+
+<!--     <tx:annotation-driven transaction-manager="inventoryTransactionManager" /> -->
+    
+    <bean id="inventoryManagerTarget"
+		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
+	</bean>
+    
+    <bean id="inventoryManager"
+		 parent="txProxyTemplate">
+		<property name="target">
+			<ref bean="inventoryManagerTarget" />
+		</property>
+	</bean>
+    
+    <!-- 物资系统数据库连接 -->
+    <bean id="inventoryDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+        <!-- 正式环境(sqlserver) -->
+        <property name="jdbcUrl" value="jdbc:sqlserver://168.1.99.163:1433;databaseName=SCIS" />
+        <property name="user" value="gys" />
+        <property name="password" value="gys" />
+    </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="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gyey/interfaces/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