Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQDataDaoImpl.java
===================================================================
diff -u -r28726 -r28892
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 28726)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 28892)
@@ -56,11 +56,7 @@
 	@Override
 	public PatientInfoVO[] syncMqPatientInfoByHospitalNumber(String hospitalNum) {
 		// 从EHSB平台获取住院病人信息(优先同步“住院病人接口”)
-		//PatientInfoVO[] patientInfoVOArray = MQHelper.getHospitalPatientMessage(hospitalNum);
-		//if (null == patientInfoVOArray || patientInfoVOArray.length == 0) {
-			// 从“非手术住院病人接口”同步数据
-		PatientInfoVO[] patientInfoVOArray = MQHelper.getNonoperativeHospitalPatientMessage(hospitalNum);
-		//}
+		PatientInfoVO[] patientInfoVOArray = MQHelper.getHospitalPatientMessage(hospitalNum);
 		// 保存到数据库
 		if (null != patientInfoVOArray && patientInfoVOArray.length > 0) {
 			try {
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQHelper.java
===================================================================
diff -u -r28736 -r28892
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQHelper.java	(.../MQHelper.java)	(revision 28736)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQHelper.java	(.../MQHelper.java)	(revision 28892)
@@ -12,8 +12,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import net.sf.json.JSON;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -24,7 +22,6 @@
 import org.dom4j.XPath;
 import org.dom4j.io.SAXReader;
 
-import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
 import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
 import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
@@ -85,11 +82,11 @@
 		//请求响应消费方:一次请求，一条响应    或者 推送发送方：一次推送，一条推送结果(EHSB平台提供的平台接入方法)
 		logger.debug("开始查询并解析手术申请单住院病人信息");
 		String fid = "BS10001";
-		String Req = "<ESBEntry><AccessControl><SysFlag>1</SysFlag><UserName>XDGYS</UserName><Password>123456</Password><Fid>" + fid + "</Fid></AccessControl>"
-					+ "<MessageHeader><Fid>" + fid + "</Fid><SourceSysCode>S16</SourceSysCode><TargetSysCode>S00</TargetSysCode><MsgDate>" + DateTools.getCurrentDayByFormat("yyyy-MM-dd HH:mm:ss")+ "</MsgDate></MessageHeader>" 
+		String Req = "<ESBEntry><AccessControl><UserName>XDGY</UserName><Password>123456</Password><SysFlag>1</SysFlag><Fid>" + fid + "</Fid></AccessControl>"
+					+ "<MessageHeader><Fid>" + fid + "</Fid><SourceSysCode>S16</SourceSysCode><TargetSysCode>S00</TargetSysCode><MsgDate>" + DateTools.getCurrentDayByFormat("yyyy-MM-dd HH:mm:ss")+ "</MsgDate></MessageHeader>"
 					+ "<RequestOption><triggerData>0</triggerData><dataAmount>500</dataAmount></RequestOption>"
-					+ "<MsgInfo flag=\"1\"><Msg></Msg><distinct value=\"0\" /><query item=\"MR_NO\" compy=\"=\" value=\"'" + HospitalNumber +"'\" splice=\"and\" /></MsgInfo>"
-					+ "<GroupInfo flag=\"0\"><AS ID=\"\" linkField=\"\" /></GroupInfo></ESBEntry>";
+					+ "<MsgInfo flag=\"1\" ><Msg></Msg><distinct value=\"0\"/><query item=\"INHOSP_INDEX_NO\" compy=\" = \"           value=\" " + HospitalNumber +" \" splice=\"AND\"/></MsgInfo>"
+					+ "<GroupInfo flag=\"0\"><AS ID=\"\" linkField=\"\"/></GroupInfo></ESBEntry>";
 		logger.debug("请求信息：" + Req);
 		String responce = null;
 		try {
@@ -249,7 +246,7 @@
 		String Req = "<ESBEntry><AccessControl><UserName>XDGYS</UserName><Password>123456</Password><SysFlag>1</SysFlag><Fid>" + fid + "</Fid></AccessControl>"
 					+ "<MessageHeader><Fid>" + fid + "</Fid><SourceSysCode>S16</SourceSysCode><TargetSysCode>S00</TargetSysCode><MsgDate>" + DateTools.getCurrentDayByFormat("yyyy-MM-dd HH:mm:ss")+ "</MsgDate></MessageHeader>" 
 					+ "<RequestOption><triggerData>0</triggerData><dataAmount>500</dataAmount></RequestOption>"
-					+ "<MsgInfo flag=\"1\"><Msg></Msg><distinct value=\"0\" /><query item=\"MR_NO\" compy=\"=\" value=\"'" + HospitalNumber +"'\" splice=\"and\" /></MsgInfo>"
+					+ "<MsgInfo flag=\"1\"><Msg></Msg><distinct value=\"0\" /><query item=\"MR_NO\" compy=\"=\" value=\"" + HospitalNumber +"\" splice=\"and\" /></MsgInfo>"
 					+ "<GroupInfo flag=\"0\"><AS ID=\"\" linkField=\"\" /></GroupInfo></ESBEntry>";
 		logger.debug("请求信息：" + Req);
 		String responce = null;
@@ -392,11 +389,11 @@
 		//请求响应消费方:一次请求，一条响应    或者 推送发送方：一次推送，一条推送结果(EHSB平台提供的平台接入方法)
 		logger.debug("开始查询并解析门诊病人信息");
 		String fid = "BS10012";
-		String Req = "<ESBEntry><AccessControl><UserName>XDGYS</UserName><Password>123456</Password><SysFlag>1</SysFlag><Fid>" + fid + "</Fid></AccessControl>"
-					+ "<MessageHeader><Fid>" + fid + "</Fid><SourceSysCode>S16</SourceSysCode><TargetSysCode>S00</TargetSysCode><MsgDate>" + DateTools.getCurrentDayByFormat("yyyy-MM-dd HH:mm:ss")+ "</MsgDate></MessageHeader>" 
+		String Req = "<ESBEntry><AccessControl><UserName>XDGY</UserName><Password>123456</Password><SysFlag>1</SysFlag><Fid>" + fid + "</Fid></AccessControl>"
+					+ "<MessageHeader><Fid>" + fid + "</Fid><SourceSysCode>S16</SourceSysCode><TargetSysCode>S00</TargetSysCode><MsgDate>" + DateTools.getCurrentDayByFormat("yyyy-MM-dd HH:mm:ss")+ "</MsgDate></MessageHeader>"
 					+ "<RequestOption><triggerData>0</triggerData><dataAmount>500</dataAmount></RequestOption>"
-					+ "<MsgInfo flag=\"1\"><distinct value=\"0\" /><query item=\"OUTHOSP_INDEX_NO\" compy=\"=\" value=\"'" + ClinicNumber +"'\" splice=\"and\" /></MsgInfo>"
-					+ "<GroupInfo flag=\"0\"><AS ID=\"\" linkField=\"\" /></GroupInfo></ESBEntry>";
+					+ "<MsgInfo flag=\"1\" ><Msg></Msg><distinct value=\"0\"/><query item=\"OUTHOSP_INDEX_NO\" compy=\" = \"           value=\"" + ClinicNumber +"\" splice=\"AND\"/></MsgInfo>"
+					+ "<GroupInfo flag=\"0\"><AS ID=\"\" linkField=\"\"/></GroupInfo></ESBEntry>";
 		logger.debug("请求信息：" + Req);
 		String responce = null;
 		try {
Index: ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring/HIS.xml
===================================================================
diff -u -r28726 -r28892
--- ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring/HIS.xml	(.../HIS.xml)	(revision 28726)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring/HIS.xml	(.../HIS.xml)	(revision 28892)
@@ -59,32 +59,7 @@
             </bean>
        </property>
     </bean>
-    
-    <bean id="findPatientInfoByHospitalNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
-       <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
-       <property name="sqlSessionFactory">
-            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/szhzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
-            </bean>
-       </property>
-    </bean>
-    
-    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">
-       <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
-        <property name="sqlSessionFactory">
-            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/szhzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
-            </bean>
-       </property>
-    </bean>
   
-  
     <!-- his数据源 -->
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
     	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szhzyy/OrgUserDataWebServiceManagerImpl.java
===================================================================
diff -u -r28726 -r28892
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szhzyy/OrgUserDataWebServiceManagerImpl.java	(.../OrgUserDataWebServiceManagerImpl.java)	(revision 28726)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szhzyy/OrgUserDataWebServiceManagerImpl.java	(.../OrgUserDataWebServiceManagerImpl.java)	(revision 28892)
@@ -32,7 +32,7 @@
 	@WebMethod
 	public String dealOrgUnit(String xmlData) {
 		logger.debug("调用接口推送组织机构数据xmlData="+xmlData);
-		String resultCode = "1";
+		String resultCode = "0";
 		String resultMessage = "";
 		if (StringUtils.isNotBlank(xmlData)) {
 			try {
@@ -62,7 +62,7 @@
 					resultMessage = "组织机构数据格式不正确";
 					return "<Response> <RetInfo> <RetCode>" + resultCode + "</RetCode>  <RetCon>" + resultMessage + "</RetCon></RetInfo></Response>";
 				}
-				resultCode = "0";
+				resultCode = "1";
 				resultMessage = "成功";
 			} catch (JSONException e) {
 				resultMessage = "数据格式有误";
@@ -81,7 +81,7 @@
 	@WebMethod
 	public String dealUser(String xmlData) {
 		logger.error("调用接口推送用户数据xmlData="+xmlData);
-		String resultCode = "1";
+		String resultCode = "0";
 		String resultMessage = "";
 		if (StringUtils.isNotBlank(xmlData)) {
 			try {
@@ -111,7 +111,7 @@
 					resultMessage = "用户数据格式不正确";
 					return "<Response> <RetInfo> <RetCode>" + resultCode + "</RetCode>  <RetCon>" + resultMessage + "</RetCon></RetInfo></Response>";
 				}
-				resultCode = "0";
+				resultCode = "1";
 				resultMessage = "成功";
 			} catch (JSONException e) {
 				resultMessage = "数据格式有误";