Index: ssts-web/src/main/resources/config/ljsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r15239 -r15857
--- ssts-web/src/main/resources/config/ljsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 15239)
+++ ssts-web/src/main/resources/config/ljsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 15857)
@@ -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">
@@ -7,22 +7,22 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT deptcode as coding,
-        	deptname as name,
-	        parentCoding as parentCoding
-	FROM cssd_department
-	where deptcode != '0'
+	SELECT coding as coding,
+        	name as name,
+	        '' as parentCoding
+	FROM jhois_v35.cssd_department
+	where coding != '0'
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT usercode as coding,
-        	username as name,
-	        deptcode as orgUnitCoding
-	FROM CSSD_User
-	ORDER BY deptcode
+	  SELECT coding as coding,
+        	Name as name,
+	        orgUnitCoding as orgUnitCoding
+	FROM jhois_v35.CSSD_User
+	ORDER BY orgUnitCoding
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/ljsrmyy/applicationContext-his.xml
===================================================================
diff -u -r15239 -r15857
--- ssts-web/src/main/resources/spring/projects/ljsrmyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 15239)
+++ ssts-web/src/main/resources/spring/projects/ljsrmyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 15857)
@@ -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"
@@ -42,10 +42,10 @@
     </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://192.168.1.254:1433;databaseName=fdyyhis" />  
-        <property name="user" value="his" />  
-        <property name="password" value="manager" />
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@192.168.0.24:1521:JHOIS" />  
+        <property name="user" value="cssd" />  
+        <property name="password" value="cssd" />
     </bean>
     
     
Index: ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
===================================================================
diff -u -r15337 -r15857
--- ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js	(.../config.js)	(revision 15337)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js	(.../config.js)	(revision 15857)
@@ -1,12 +1,12 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 审核器械包必须入篮筐（一级供应室）
   mustScanBasketForTousseReview : false,
   // 审核器械包必须入篮筐（二级供应室）
   mustScanBasketForTousseReviewOf2ndSupplyRoom : false,
   // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
-  applicationFormType : 2,
+  applicationFormType : 1,
   hidePackageSpec : true,
   // 申请界面是否显示器械包或消毒物品的的单位
   showTousseUnitColumn : false,		
Index: ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r15239 -r15857
--- ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 15239)
+++ ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 15857)
@@ -1,9 +1,20 @@
-<?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.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[
@@ -12,9 +23,11 @@
 	        h.patientAge as patientAge,
 	        h.patientSex as patientSex,
 	        h.patientIDCard as patientIDCard,
-	        '' as doctorName,
+	        h.doctorName as doctorName,
+                h.roomNumber As roomNumber,
+                h.bedNumber As bedNumber,
 	        '' as operation
-	FROM CSSD_ClinicNumber h
+	FROM jhois_v35.CSSD_ClinicNumber h
 	WHERE h.clinicNumber = #{treatmentNum}
 	]]>
   </select>
Index: ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r15239 -r15857
--- ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 15239)
+++ ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 15857)
@@ -1,9 +1,12 @@
-<?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.FindPatientInfoByHospitalNumDao">
   
+
+
+
   <!-- 按住院号查找病人信息 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
@@ -13,8 +16,10 @@
 	        h.patientSex as patientSex,
 	        h.patientIDCard as patientIDCard,
 	        h.doctorName as doctorName,
-	        h.operation as operation
-	FROM CSSD_HospitalNumber h
+                h.roomNumber as roomNumber,
+                h.bedNumber as bedNumber
+	       
+	FROM jhois_v35.CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
 	]]>
   </select>