Index: ssts-web/src/main/resources/config/cdlqyq1yy/dataSyncConfig.json
===================================================================
diff -u -r17300 -r21271
--- ssts-web/src/main/resources/config/cdlqyq1yy/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 17300)
+++ ssts-web/src/main/resources/config/cdlqyq1yy/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 21271)
@@ -9,7 +9,7 @@
 		"更新交集数据" : true,
 		"移除差集数据" : false,
 		"默认角色ID":[
-			"ROLE_sqry_0"
+			"lcksry"
 		]
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/cdlqyq1yy/applicationContext-his.xml
===================================================================
diff -u -r17367 -r21271
--- ssts-web/src/main/resources/spring/projects/cdlqyq1yy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 17367)
+++ ssts-web/src/main/resources/spring/projects/cdlqyq1yy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 21271)
@@ -41,12 +41,12 @@
         class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
     </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://10.0.1.185;databaseName=cx_bsrun;integratedSecurity=false" />   
-       
-        <property name="user" value="cssd" />  
-        <property name="password" value="cssd" />
+
+	 <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" /> 
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//172.16.128.5:1521/orcl" />  
+        <property name="user" value="zl_xdgy" />  
+        <property name="password" value="123" />
     </bean>
     
     
Index: ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r18573 -r21271
--- ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 18573)
+++ ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 21271)
@@ -4,40 +4,67 @@
   "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
-	       
-	FROM jhois_v35.CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum}
+	SELECT  a.住院号 as hospitalNumber,
+			a.主页ID as visitId,
+			a.姓名 as patientName,
+			a.年龄 as patientAge,
+			a.性别 as patientSex,
+			b.身份证号 as patientIDCard,
+			a.住院医师 as doctorName,
+			d.已行手术 as operation,
+			'' as operationTime,
+			c1.名称 as ascriptionDepartment,
+			c2.名称 as patientArea,
+			a.出院病床 as bedNumber,
+			'' as remark,
+			'' as operationRoom
+
+		   From 病案主页 a, 病人信息 b, 部门表 c1,部门表 c2,病人手麻记录 d
+
+		  Where a.病人id = b.病人id 
+			And a.病人ID=d.病人ID(+) 
+			And a.主页ID=d.主页Id(+) 
+			And a.出院科室ID=c1.Id
+			And a.当前病区ID=c2.Id 
+			And nvl(a.出院日期,Sysdate)>=Sysdate-100
+			And a.住院号 = #{hospitalNum}
+			Order By a.入院日期 desc,trunc(d.手术开始时间) 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
-	       
-	FROM jhois_v35.CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum}
+	SELECT  a.住院号 as hospitalNumber,
+			a.主页ID as visitId,
+			a.姓名 as patientName,
+			a.年龄 as patientAge,
+			a.性别 as patientSex,
+			b.身份证号 as patientIDCard,
+			a.住院医师 as doctorName,
+			d.已行手术 as operation,
+			'' as operationTime,
+			c1.名称 as ascriptionDepartment,
+			c2.名称 as patientArea,
+			a.出院病床 as bedNumber,
+			'' as remark,
+			'' as operationRoom
+
+		From 病案主页 a, 病人信息 b, 部门表 c1,部门表 c2,病人手麻记录 d
+
+		  Where a.病人id = b.病人id 
+			And a.病人ID=d.病人ID(+) 
+			And a.主页ID=d.主页Id(+) 
+			And a.出院科室ID=c1.Id
+			And a.当前病区ID=c2.Id 
+			And nvl(a.出院日期,Sysdate)>=Sysdate-100
+			And a.住院号 = #{hospitalNum}
+			Order By a.入院日期 desc,trunc(d.手术开始时间) desc
 	]]>
   </select>
   
Index: ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r17300 -r21271
--- ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 17300)
+++ ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 21271)
@@ -7,22 +7,29 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT coding as coding,
-        	name as name,
-	        '' as parentCoding
-	FROM jhois_v35.cssd_department
-	where coding != '0'
+	SELECT  d.名称 as deptName,
+			d.编码 as deptCode 
+
+	   From 部门表 d 
+	  Where nvl(撤档时间,Sysdate)>=Sysdate
+			And d.编码 != '0'
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	  SELECT coding as coding,
-        	Name as name,
-	        orgUnitCoding as orgUnitCoding
-	FROM jhois_v35.CSSD_User
-	ORDER BY orgUnitCoding
+	  SELECT  a.姓名 as userName,
+			  c.用户名 as userCode,
+			  d.编码 as deptCode 
+
+	  From 人员表 a,部门人员 b,上机人员表 c,部门表 d 
+
+	  Where nvl(a.撤档时间,Sysdate)>=Sysdate
+			And b.人员ID=a.Id 
+			And a.Id=c.人员ID 
+			And b.部门ID=d.Id
+			Order By 1,2,b.缺省 desc
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r17300 -r21271
--- ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 17300)
+++ ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 21271)
@@ -3,32 +3,31 @@
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao">
-  
-    <!-- 转换性别 -->
-  <sql id="patientSexField">
-  <![CDATA[
-    (case when (h.patientSex ='1') then '男'
-          when (h.patientSex ='2') then '女'
-          else null
-    end
-    ) as patientSex
-  ]]>
-  </sql>
 
   <!-- 按门诊号查找病人信息 -->
   <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,
-	        h.doctorName as doctorName,
-                h.roomNumber As roomNumber,
-                h.bedNumber As bedNumber,
-	        '' as operation
-	FROM jhois_v35.CSSD_ClinicNumber h
-	WHERE h.clinicNumber = #{treatmentNum}
+	SELECT  b.病人id as Clinicnumber, 
+			b.姓名 as Patientname, 
+			b.年龄 as Patientage, 
+			b.性别 as patientSex, 
+			b.身份证号 as patientIDCard, 
+			a.执行人 as doctorName, 
+			c.名称 as ascriptionDepartment, 
+			'' as bedNumber,
+			trunc(a.执行时间) as visitDate, 
+			zlhis.Zl_就诊次数(a.id,b.病人id) as visitId, 
+			'' as remark,
+			'' as operationRoom
+
+	   From 病人挂号记录 a, 病人信息 b, 部门表 c
+
+	  Where a.病人id = b.病人id 
+		And a.执行部门id = c.Id 
+		And a.执行时间 > Sysdate - 100
+		And b.病人id = #{treatmentNum}
+		Order By 9 desc,1 Desc,10 Desc,7
+	
 	]]>
   </select>