Index: ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r24804 -r25196
--- ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 24804)
+++ ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 25196)
@@ -7,32 +7,48 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	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 
+HOSPITALNUMBER ,
+SEARIALNUMBER,
+PATIENTNAME,
+PATIENTAGE ,
+PATIENTSEX,
+PATIENTIDCARD ,
+DOCTORNAME ,
+OPERATION ,
+ASOPERATIONTIME ,
+PATIENTAREA  ,
+BEDNUMBER ,
+REMARK    ,
+WASHHANDNURSE ,
+CIRCUITNURSE ,
+OPROOMID
+from  hisdb.cssd_hospitalnumber
+	WHERE hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	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 
+HOSPITALNUMBER ,
+SEARIALNUMBER,
+PATIENTNAME,
+PATIENTAGE ,
+PATIENTSEX,
+PATIENTIDCARD ,
+DOCTORNAME ,
+OPERATION ,
+ASOPERATIONTIME ,
+PATIENTAREA  ,
+BEDNUMBER ,
+REMARK    ,
+WASHHANDNURSE ,
+CIRCUITNURSE ,
+OPROOMID
+from  hisdb.cssd_hospitalnumber
+	WHERE hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
Index: ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r24804 -r25196
--- ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 24804)
+++ ssts-web/src/main/resources/config/stdxyxyfszlyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 25196)
@@ -7,15 +7,23 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	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 
+CLINICNUMBER ,
+SERIALNUMBER ,
+PATIENTNAME,
+PATIENTAGE,
+PATIENTSEX,
+PATIENTIDCARD,
+DOCTORNAME,
+OPERATION ,
+OPERATIONTIME, 
+PATIENTAREA,
+REMARK  ,
+WASHHANDNURSE,
+CIRCUITNURSE,
+OPROOMID 
+ from hisdb.cssd_clinicnumber
+	WHERE clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/resources/spring/projects/stdxyxyfszlyy/HIS.xml
===================================================================
diff -u -r24804 -r25196
--- ssts-web/src/main/resources/spring/projects/stdxyxyfszlyy/HIS.xml	(.../HIS.xml)	(revision 24804)
+++ ssts-web/src/main/resources/spring/projects/stdxyxyfszlyy/HIS.xml	(.../HIS.xml)	(revision 25196)
@@ -87,10 +87,10 @@
   
     <!-- 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="" />
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+      <property name="jdbcUrl" value="jdbc:oracle:thin:@//199.199.197.250:1521/oradb" />
+        <property name="user" value="CSSD" />  
+        <property name="password" value="CSSD_PASSWORD" />
     </bean>
     
    <bean id="inventoryManagerTarget"