Index: ssts-web/src/main/resources/config/dgfy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r19654 -r19741
--- ssts-web/src/main/resources/config/dgfy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 19654)
+++ ssts-web/src/main/resources/config/dgfy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 19741)
@@ -2,28 +2,21 @@
 <!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  name, coding,parentcoding from CSSD_Department where coding<>0 order by  parentcoding , coding
+
 	]]>
   </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 * from cssd_user where Coding != ''
+	ORDER BY orgunitcoding
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r19654 -r19741
--- ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 19654)
+++ ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 19741)
@@ -2,38 +2,21 @@
 <!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}
-	]]>
+        <![CDATA[    
+		 select * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+		]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
-  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+    <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 * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
 	]]>
   </select>
-  
+ 
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r19654 -r19741
--- ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 19654)
+++ ssts-web/src/main/resources/config/dgfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 19741)
@@ -5,18 +5,12 @@
 <mapper namespace="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao">
   
   <!-- 按门诊号查找病人信息 -->
-  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  
+<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 * from cssd_clinicnumber where clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
+
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/dgfy/timer.xml
===================================================================
diff -u -r19654 -r19741
--- ssts-web/src/main/resources/spring/projects/dgfy/timer.xml	(.../timer.xml)	(revision 19654)
+++ ssts-web/src/main/resources/spring/projects/dgfy/timer.xml	(.../timer.xml)	(revision 19741)
@@ -65,9 +65,9 @@
     <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
         <property name="triggers">
             <list>
-                <ref bean="timingAutoSignInvoiceJobTrigger"/>
+                <!-- <ref bean="timingAutoSignInvoiceJobTrigger"/>
                 <ref bean="syncOrgUnitAndUserJobTrigger"/>
-                <ref bean="autoCopyDisposableGoodsStockJobTrigger"/>
+                <ref bean="autoCopyDisposableGoodsStockJobTrigger"/> -->
             </list>
         </property>
     </bean>
Index: ssts-web/src/main/resources/spring/projects/dgfy/HIS.xml
===================================================================
diff -u -r19654 -r19741
--- ssts-web/src/main/resources/spring/projects/dgfy/HIS.xml	(.../HIS.xml)	(revision 19654)
+++ ssts-web/src/main/resources/spring/projects/dgfy/HIS.xml	(.../HIS.xml)	(revision 19741)
@@ -1,14 +1,20 @@
 <?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">
+	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系统数据库相关注入 -->
 	
@@ -45,18 +51,19 @@
     <!-- 此处定义多个数据源。根据开发和生产环境需要，设置所用数据源的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://192.168.211.213:1433;databaseName=bsrun1" />  
-		<property name="user" value="user_gys" />  
-        <property name="password" value="user_gys" />  
+        destroy-method="close">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//10.18.16.20:1521/dgfy" />  
+        <property name="user" value="hisjk" />  
+        <property name="password" value="hisjk" />  
     </bean>
     
-    
-    <!-- 由MyBatis实现访问HIS数据的Dao接口
-    <bean id="syncOrgUnitAndUserSource2Dao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+
+
+<!-- 由MyBatis实现访问HIS数据的Dao接口-->
+    <bean id="syncOrgUnitAndUserDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserSource2Dao" />  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserDao" />  
        <property name="sqlSessionFactory"> 
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
@@ -65,13 +72,13 @@
             </bean>
        </property>
     </bean>
-        
-    -->
+   
 
-   <bean id="findPatientInfoByTreatmentNumDao2" class="org.mybatis.spring.mapper.MapperFactoryBean">
+     <!-- 诊疗号 -->
+    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
-        <property name="sqlSessionFactory">
+       <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
                 <property name="mapperLocations" value="classpath:config/dgfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
@@ -81,26 +88,19 @@
     </bean>
     
     
-    <!-- 旧HIS 住院号 -->
-    <bean id="hisDataSource2"
-        class="com.mchange.v2.c3p0.ComboPooledDataSource"
-		destroy-method="close">
-        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
-        <property name="jdbcUrl" value="jdbc:sqlserver://192.168.211.214:1433;databaseName=hc_his" /> 
-        <property name="user" value="user_gys" />  
-        <property name="password" value="user_gys" />  
-    </bean>
-    
-    <bean id="findPatientInfoByHospitalNumDao2" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+   
+    <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="hisDataSource2" />
+                <property name="dataSource" ref="hisDataSource" />
                 <property name="mapperLocations" value="classpath:config/dgfy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
     </bean>
+
     
+    
 </beans>
\ No newline at end of file