Index: ssts-web/src/main/resources/spring/projects/gdsrmyyzhyy/HIS.xml
===================================================================
diff -u -r27297 -r27351
--- ssts-web/src/main/resources/spring/projects/gdsrmyyzhyy/HIS.xml	(.../HIS.xml)	(revision 27297)
+++ ssts-web/src/main/resources/spring/projects/gdsrmyyzhyy/HIS.xml	(.../HIS.xml)	(revision 27351)
@@ -1,5 +1,4 @@
-<<<<<<< .mine
-<?xml version="1.0" encoding="UTF-8"?>
+<?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"
@@ -117,124 +116,4 @@
             </bean>
        </property>
     </bean>  
-</beans>||||||| .r0
-=======
-<?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="config/gdsrmyyzhyy/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=gdsrmyyzhyyhis" />  
-        <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="classpath:config/gdsrmyyzhyy/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="classpath:config/gdsrmyyzhyy/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/gdsrmyyzhyy/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="classpath:config/gdsrmyyzhyy/mybatis/syncFromHERP_Mapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
-            </bean>
-       </property>
-    </bean>  
-</beans>>>>>>>> .r27294
+</beans>
\ No newline at end of file