Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/primaryJmsIbmListener.xml
===================================================================
diff -u -r39619 -r39630
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/primaryJmsIbmListener.xml	(.../primaryJmsIbmListener.xml)	(revision 39619)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/primaryJmsIbmListener.xml	(.../primaryJmsIbmListener.xml)	(revision 39630)
@@ -89,7 +89,7 @@
  
     <!-- 手术安排信息注册服务的队列名称 -->
     <bean id="createOperationPlanQueuePrimary" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_createOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_createOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息注册服务的消息监听器容器 -->
@@ -103,7 +103,7 @@
     
     <!-- 手术安排信息更新服务的队列名称 -->
     <bean id="updateOperationPlanQueuePrimary" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_updateOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_updateOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息更新服务的消息监听器容器 -->
@@ -117,7 +117,7 @@
     
     <!-- 手术安排信息作废服务的队列名称 -->
     <bean id="deleteOperationPlanQueuePrimary" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_cancleOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_cancleOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息作废服务的消息监听器容器 -->
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml
===================================================================
diff -u -r39565 -r39630
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml	(.../HIS.xml)	(revision 39565)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml	(.../HIS.xml)	(revision 39630)
@@ -63,7 +63,7 @@
     <!-- 中二花都院区HIS使用东软RealOne 3.0 Pro平台接口同步科室人员 -->
 	<bean id="syncOrgUnitAndUserSource2Dao" class="com.forgon.disinfectsystem.datasynchronization.dao.zsdxfsdeyy.SyncOrgUnitAndUserDaoImpl">
 		<!-- 默认上级科室为“花都院区” -->
-		<property name="defaultParentOrgUnitCode" value="HSYQ" />
+		<property name="defaultParentOrgUnitCode" value="csyq" />
 	</bean>
     
     <!-- 由MyBatis实现访问HIS住院患者数据的Dao接口 -->
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r35800 -r39630
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 35800)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 39630)
@@ -7,27 +7,26 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-     SELECT  
+SELECT  
          SEQNOTEXT AS hospitalNumber,
          patientName,
 		 SEXFLAG AS patientSex,
          floor(months_between(sysdate, BIRTHTIME)/12) AS patientAge,
          ID_NO AS patientIDCard
-      from apps.v_inpatient_gongyingshi
-	  WHERE ENCOUNTERID = #{hospitalNum}
+      from (SELECT * from apps.v_inpatient_gongyingshi where SEQNOTEXT	= #{hospitalNum}  order by ENCOUNTERID desc) WHERE ROWNUM = 1 
 ]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
-  <![CDATA[
-	 SELECT  
-         CODE_IP AS hospitalNumber,
-         NAME_PI AS patientName,
-         TRUNC(months_between(sysdate, BIRTH_DATE)/12) AS patientAge,
+  <![CDATA[ 
+SELECT  
+         SEQNOTEXT AS hospitalNumber,
+         patientName,
+		 SEXFLAG AS patientSex,
+         floor(months_between(sysdate, BIRTHTIME)/12) AS patientAge,
          ID_NO AS patientIDCard
-      from apps.v_inpatient_gongyingshi
-	  WHERE CODE_IP = #{hospitalNum}
+      from (SELECT * from apps.v_inpatient_gongyingshi where SEQNOTEXT	= #{hospitalNum}  order by ENCOUNTERID desc) WHERE ROWNUM = 1 
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/replicaJmsIbmListener.xml
===================================================================
diff -u -r39619 -r39630
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/replicaJmsIbmListener.xml	(.../replicaJmsIbmListener.xml)	(revision 39619)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/replicaJmsIbmListener.xml	(.../replicaJmsIbmListener.xml)	(revision 39630)
@@ -89,7 +89,7 @@
  
     <!-- 手术安排信息注册服务的队列名称 -->
     <bean id="createOperationPlanQueueReplica" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_createOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_createOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息注册服务的消息监听器容器 -->
@@ -103,7 +103,7 @@
     
     <!-- 手术安排信息更新服务的队列名称 -->
     <bean id="updateOperationPlanQueueReplica" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_updateOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_updateOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息更新服务的消息监听器容器 -->
@@ -117,7 +117,7 @@
          
     <!-- 手术安排信息作废服务的队列名称 -->
     <bean id="deleteOperationPlanQueueReplica" class="com.ibm.mq.jms.MQQueue">
-        <property name="baseQueueName" value="DX_XDGY_cancleOperationPlan"/>
+        <property name="baseQueueName" value="XDGY_cancleOperationPlan"/>
     </bean>
     
     <!-- 启动手术安排信息作废服务的消息监听器容器 -->
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperLocal.xml
===================================================================
diff -u -r39565 -r39630
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperLocal.xml	(.../FindPatientInfoByHospitalNumMapperLocal.xml)	(revision 39565)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapperLocal.xml	(.../FindPatientInfoByHospitalNumMapperLocal.xml)	(revision 39630)
@@ -6,53 +6,53 @@
 
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-		select 
+select TOP 1
+        
 		op.requestNo			operationScheduleId,
-		op.patientNo			hospitalNumber,
-		op.patientName			patientName,
-		op.genderName			patientSex,
-		op.bedNo				bedNumber,
-		op.operationName		operation,
-		op.operationRoomName	opRoomId,
-		convert(varchar,op.operationTime,120)		operationTime,
-		op.operatorName			doctorName,
-		op.washHandNurse		washHandNurse,
-		op.circuitNurse			circuitNurse,
-		od.age 					patientAge,
-		od.idCardNumber 		patientIDCard,
-		od.deptCode				ascriptionDepartCode,
-		od.deptName				ascriptionDepartment,
-		od.wardName				patientArea
-		from OperationPlan op
-		left join OperationApply od on op.requestNo = od.requestNo
-		where op.opStatus = 0
-		and op.patientNo = #{hospitalNum}
-		order by op.operationTime desc
+	    op.patientName			patientName,
+        op.idCardNumber 		patientIDCard,
+		op.bedName			    bedNumber,
+		op.deptCode				ascriptionDepartCode,
+		op.deptName				ascriptionDepartment,
+		op.wardName				patientArea,
+		op.age 					patientAge,
+		op.genderName           patientSex
+
+		from OperationApply op 
+		where  
+		op.cardNo = #{hospitalNum} 	
+		or op.clinicNo= #{hospitalNum}
+		or op.visitNo= #{hospitalNum}
+		or visitSqNo= #{hospitalNum}
+		or op.empiId= #{hospitalNum}	
+
+		order by op.id desc
 	]]>
   </select>
   
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-		select
-		oa.requestNo			operationScheduleId,
-		oa.visitNo 				hospitalNumber,
-		oa.idCardNumber 		patientIDCard,
-		oa.patientName 			patientName,
-		oa.genderName 			patientSex,
-		oa.age 					patientAge,
-		oa.bedName				bedNumber,
-		oa.sickroomName			roomNumber,
-		oa.deptCode				ascriptionDepartCode,
-		oa.deptName				ascriptionDepartment,
-		oa.wardName				patientArea,
-		od.operativeName		operation,
-		od.operatorName			doctorName,
-		convert(varchar,od.operationDate,120)		operationTime
-		from OperationApply oa
-		join OperationDesc od on od.operationApply_id = oa.id
-		where oa.oaStatus = 0
-		and oa.visitNo = #{hospitalNum}
-		order by oa.operationDate desc
+select TOP 1
+        
+		op.requestNo			operationScheduleId,
+	    op.patientName			patientName,
+        op.idCardNumber 		patientIDCard,
+		op.bedName			    bedNumber,
+		op.deptCode				ascriptionDepartCode,
+		op.deptName				ascriptionDepartment,
+		op.wardName				patientArea,
+		op.age 					patientAge,
+		op.genderName           patientSex
+
+		from OperationApply op 
+		where  
+		op.cardNo = #{hospitalNum} 	
+		or op.clinicNo= #{hospitalNum}
+		or op.visitNo= #{hospitalNum}
+		or visitSqNo= #{hospitalNum}
+		or op.empiId= #{hospitalNum}	
+
+		order by op.id desc
 	]]>
   </select>