Index: ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r22676 -r22748
--- ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 22676)
+++ ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 22748)
@@ -7,20 +7,15 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  clinicNumber as patientNumber,
-        	patientName,
-	        convert(varchar,patientAge) patientAge,
-	        case when patientSex='0' then '男' when patientSex='1' then '女' end patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		ROOMNUMBER,
-	        patientArea,
-	        REMARK
-	FROM V_SICK_VISIT_INFO
-	WHERE clinicNumber = #{treatmentNum}
+	SELECT h.clinicNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        '' doctorName,
+	        '' operation
+	FROM CSSD_ClinicNumber h
+	WHERE h.clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/resources/spring/projects/blxrmyy/HIS.xml
===================================================================
diff -u -r22676 -r22748
--- ssts-web/src/main/resources/spring/projects/blxrmyy/HIS.xml	(.../HIS.xml)	(revision 22676)
+++ ssts-web/src/main/resources/spring/projects/blxrmyy/HIS.xml	(.../HIS.xml)	(revision 22748)
@@ -93,10 +93,10 @@
   
        <!-- 本地模拟同步物质 -->
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
-    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
-    	<property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.2.222:1521/ORCL" />   
-    	<property name="user" value="apps" />
-    	<property name="password" value="apps" />
+    	<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"
Index: ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r22676 -r22748
--- ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22676)
+++ ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22748)
@@ -7,42 +7,32 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  hospitalNumber as patientNumber,
-        	patientName,
-	       	convert(varchar,patientAge) patientAge,
-	        patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		ROOMNUMBER,
-	        patientArea,
-	        REMARK
- 	FROM V_MEDINFOTABLEHIS
-	WHERE hospitalNumber = #{hospitalNum}
-	order by operationTime desc
+	SELECT h.hospitalNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        h.doctorName doctorName,
+	        h.operation operation,
+	        convert(varchar,h.operationTime,120) operationTime
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  hospitalNumber as patientNumber,
-        	patientName,
-	       	convert(varchar,patientAge) patientAge,
-	        patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		ROOMNUMBER,
-	        patientArea,
-	        REMARK
- 	FROM V_MEDINFOTABLEHIS
-	WHERE hospitalNumber = #{hospitalNum}
-	order by operationTime desc
+	SELECT h.hospitalNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        h.doctorName doctorName,
+	        h.operation operation,
+	        convert(varchar,h.operationTime,120) operationTime
+	FROM CSSD_HospitalNumber h
+	WHERE h.hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
Index: ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r22676 -r22748
--- ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 22676)
+++ ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 22748)
@@ -7,17 +7,20 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT coding,name,PARENTCODING
-	FROM V_DEPARTMENT_DICT
+	SELECT coding,name,parentCoding
+	FROM  dbo.CSSD_Department where coding is not null and len(coding) > 0
+	and name is not null and len(name) > 0
+	and coding != '0'
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
 	SELECT coding,name,orgUnitCoding
-	FROM V_STAFF_INFO
-	ORDER BY orgUnitCoding
+	FROM dbo.CSSD_User where coding is not null and len(coding) > 0
+	and name is not null and len(name) > 0
+	ORDER BY coding
 	]]>
   </select>
 </mapper>
\ No newline at end of file