Fisheye: Tag 32265 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper_xh.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 32265)
@@ -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 clinicNumber as patientNumber,
+        	patientName as patientName,
+	        patientAge as patientAge,
+	        case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	        patientIDCard as patientIDCard,
+	        doctorName as doctorName,
+	        operation as operation
+	FROM CSSD_ClinicNumber
+	WHERE clinicNumber = #{treatmentNum}
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS.xml
===================================================================
diff -u -r29079 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS.xml	(.../HIS.xml)	(revision 29079)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS.xml	(.../HIS.xml)	(revision 32265)
@@ -1,4 +1,4 @@
-<?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"
@@ -13,35 +13,7 @@
 	<!-- 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/gxzyyf1/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 -->
     <bean id="hisDataSource"
         class="com.mchange.v2.c3p0.ComboPooledDataSource"
@@ -74,7 +46,7 @@
         <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath:config/gxzyyf1/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
@@ -97,7 +69,7 @@
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource2" />
-                <property name="mapperLocations" value="classpath:config/gxzyyf1/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(revision 32265)
@@ -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 hospitalNumber as patientNumber,
+        	patientName as patientName,
+	        patientAge as patientAge,
+	        case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	        patientIDCard as patientIDCard,
+	        doctorName as doctorName,
+	        operation as operation
+
+	FROM CSSD_HospitalNumber
+	WHERE hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+	SELECT hospitalNumber as patientNumber,
+        	patientName as patientName,
+	        patientAge as patientAge,
+	        case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	        patientIDCard as patientIDCard,
+	        doctorName as doctorName,
+	        operation as operation
+
+	FROM CSSD_HospitalNumber
+	WHERE hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/SyncOrgUnitAndUserMapper_xh.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/SyncOrgUnitAndUserMapper_xh.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/SyncOrgUnitAndUserMapper_xh.xml	(revision 32265)
@@ -0,0 +1,21 @@
+<?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 deptname as name,deptcode as coding,parentcoding from CSSD_Department order by length(parentcoding), parentcoding , deptcode
+
+	]]>
+  </select>
+  
+  <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+	select username name,usercode coding,deptcode orgunitcoding from cssd_user
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Fisheye: Tag 32265 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/spring/HIS_xh.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml	(revision 32265)
@@ -0,0 +1,23 @@
+<?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 as patientNumber,
+	         patientName,
+	         patientAge,
+	         case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	         patientIDCard,
+	         doctorName,
+	         operation 
+			 from cssd_clinicnumber where clinicnumber=#{treatmentNum}
+	]]>
+  </select>
+
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r27959 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 27959)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 32265)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml	(revision 32265)
@@ -0,0 +1,35 @@
+<?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 as patientNumber,
+        	patientName as patientName,
+	        patientAge as patientAge,
+	         case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	        patientIDCard as patientIDCard,
+	        doctorName as doctorName,
+	        operation as operation 
+			from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+		]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+	select hospitalNumber as patientNumber,
+        	patientName as patientName,
+	        patientAge as patientAge,
+	         case when patientSex='1' or patientSex='M' then '男' when patientSex='2' or patientSex='F' then '女' end patientSex,
+	        patientIDCard as patientIDCard,
+	        doctorName as doctorName,
+	        operation as operation 
+			from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS_xh.xml
===================================================================
diff -u -r29087 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS_xh.xml	(.../HIS_xh.xml)	(revision 29087)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring/HIS_xh.xml	(.../HIS_xh.xml)	(revision 32265)
@@ -1,4 +1,4 @@
-<?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"
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r27959 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 27959)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 32265)
@@ -1,29 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.SyncOrgUnitAndUserSource2Dao">
+<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
-	where deptCode != 0 and deptCode != -1
+	SELECT deptname as name,deptcode as coding,parentcoding from CSSD_Department order by length(parentcoding), parentcoding , deptcode
+
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT userCode as coding,
-        	userName as name,
-	        deptCode as orgUnitCoding
-	FROM CSSD_User
-	where userCode != ''
-	ORDER BY deptCode
+	select username name,usercode coding,deptcode orgunitcoding from cssd_user
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Fisheye: Tag 32265 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r27959 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 27959)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 32265)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
Fisheye: Tag 32265 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper2.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 32265 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/dataSyncConfig.json
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/dataSyncConfig.json	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/dataSyncConfig.json	(revision 32265)
@@ -0,0 +1,15 @@
+{
+	"同步组织机构":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false
+	},
+	"同步用户":{
+		"默认父节点的编码" : "0",
+		"更新交集数据" : true,
+		"移除差集数据" : false,
+		"默认角色ID":[
+			"ROLE_sly_0"
+		]
+	}
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/spring/HIS.xml
===================================================================
diff -u -r28007 -r32265
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/spring/HIS.xml	(.../HIS.xml)	(revision 28007)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/spring/HIS.xml	(.../HIS.xml)	(revision 32265)
@@ -1,4 +1,4 @@
-<?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"
@@ -101,4 +101,27 @@
 
 	<bean class="com.forgon.disinfectsystem.datasynchronization.dao.gxzyyf1.FindPatientInfoByTreatmentNumDaoImpl" id="findPatientInfoByTreatmentNumDao"/>
     
+    <!-- 此处定义多个数据源。根据开发和生产环境需要，设置所用数据源的Bean id 为 hisDataSource -->
+    <bean id="hisDataSource_xh"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:middle/xhmiddle@//192.168.222.5:1521/hisdb" />  
+        <property name="user" value="middle" />  
+        <property name="password" value="xhmiddle" />  
+    </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_xh" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gxzyyf1/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
 </beans>
\ No newline at end of file