Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQDataDaoImpl.java
===================================================================
diff -u -r29878 -r29887
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 29878)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 29887)
@@ -79,7 +79,8 @@
 	private void buildOrgUnitSyncListener() {
 		EwellServiceTool ewellServiceTool = new EwellServiceTool();
         try {
-            ewellServiceTool.buildTopicListener(MQHelper.queueManagerName, "EQ.S17.PS02017.COLLECT", "S17", new MessageHandler() {
+        	logger.info("监听科室EQ.S17.PS02017.COLLECT队列");
+            ewellServiceTool.buildTopicListener(MQHelper.ORGANDUSERQUEUEMANAGERNAME, "EQ.S17.PS02017.COLLECT", "S17", new MessageHandler() {
                 @Override
                 public void onMessage(MessageEntity messageEntity) {
                 	if(messageEntity != null){
@@ -109,6 +110,10 @@
 	 * @param orgUnitString
 	 */
 	private void synchAllOrgUnitVoData(String orgUnitString) {
+		/*String orgResult= "<ESBEntry><MessageHeader><Fid>PS02017</Fid><HospCode>DG01</HospCode><OrderNo>PS02017S17001</OrderNo><SourceSysCode>S92</SourceSysCode><TargetSysCode>S17</TargetSysCode><ReturnFlag>-1</ReturnFlag><MsgDate>2020-12-11 13:20:30</MsgDate></MessageHeader><MsgInfo>"
+		+ "<Msg action=\"update\" lastUpdate=\"2020-12-11 13:20:30\"><CREATE_USER>admin</CREATE_USER><CREATE_TIME>2020-11-26 18:34:34</CREATE_TIME><UPDATE_USER>admin</UPDATE_USER><UPDATE_TIME>2020-12-11 13:20:12</UPDATE_TIME><DEPT_INDEX_NO>10278</DEPT_INDEX_NO><DEPT_CODE>0101</DEPT_CODE><DEPT_NAME>内一科病区1</DEPT_NAME><PINYIN_CODE>NYKBQ</PINYIN_CODE><WUBI_CODE>MGTUA</WUBI_CODE><SUBOR_HOSPITAL_DISTRICT>01</SUBOR_HOSPITAL_DISTRICT><SUPERIOR_DEPT_CODE>1002010102</SUPERIOR_DEPT_CODE><SUPERIOR_DEPT_NAME>内一科科室</SUPERIOR_DEPT_NAME><MEDICARE_DEPT_CODE/><MEDICARE_DEPT_NAME/><MR_DEPT_CODE/><MR_DEPT_NAME/><INVALID_FLAG>0</INVALID_FLAG><DESCR/><UPDATE_DATE/><RECORD_DATE/><DEPT_CATEG_CODE>2</DEPT_CATEG_CODE><DEPT_CATEG_NAME>病区</DEPT_CATEG_NAME><CLINIC_DEPT_FLAG/><OI_DEPT_FLAG>2</OI_DEPT_FLAG><MS_DEPT_FLAG/><IS_WARD>1</IS_WARD><IS_WARD_NAME>是</IS_WARD_NAME><VERSION_NUMBER>888</VERSION_NUMBER></Msg>"
+		+ "<Msg action=\"update\" lastUpdate=\"2020-12-11 13:20:30\"><CREATE_USER>admin</CREATE_USER><CREATE_TIME>2020-11-26 18:34:34</CREATE_TIME><UPDATE_USER>admin</UPDATE_USER><UPDATE_TIME>2020-12-11 13:20:12</UPDATE_TIME><DEPT_INDEX_NO>10278</DEPT_INDEX_NO><DEPT_CODE>0101</DEPT_CODE><DEPT_NAME>内一科病区2</DEPT_NAME><PINYIN_CODE>NYKBQ</PINYIN_CODE><WUBI_CODE>MGTUA</WUBI_CODE><SUBOR_HOSPITAL_DISTRICT>01</SUBOR_HOSPITAL_DISTRICT><SUPERIOR_DEPT_CODE>1002010102</SUPERIOR_DEPT_CODE><SUPERIOR_DEPT_NAME>内一科科室</SUPERIOR_DEPT_NAME><MEDICARE_DEPT_CODE/><MEDICARE_DEPT_NAME/><MR_DEPT_CODE/><MR_DEPT_NAME/><INVALID_FLAG>0</INVALID_FLAG><DESCR/><UPDATE_DATE/><RECORD_DATE/><DEPT_CATEG_CODE>2</DEPT_CATEG_CODE><DEPT_CATEG_NAME>病区</DEPT_CATEG_NAME><CLINIC_DEPT_FLAG/><OI_DEPT_FLAG>2</OI_DEPT_FLAG><MS_DEPT_FLAG/><IS_WARD>1</IS_WARD><IS_WARD_NAME>是</IS_WARD_NAME><VERSION_NUMBER>888</VERSION_NUMBER></Msg>"
+		+ "</MsgInfo></ESBEntry>";*/
 		try {
 			// 解析入库
 			if (StringUtils.isNotBlank(orgUnitString)) {
@@ -123,29 +128,23 @@
 					List<OrgUnitVo> orgUnitVoList = new ArrayList<OrgUnitVo>();
 					for (int i = 1; i <= nodeList2.size(); i++) {
 						String msgXpath = "/ESBEntry/MsgInfo/Msg[" + i + "]";
-						String orgUnitInfo = MQHelper.processDataByXpath(doc, msgXpath); // 科室信息
-						if(StringUtils.isNotBlank(orgUnitInfo)){
-							Document document = DocumentHelper.parseText(orgUnitInfo);
-							String actionXpath = "/Msg/@action";	//action判断增、删、改
-							String codingXpath = "/Msg/DEPT_CODE";	// 科室代码
-							String nameXpath = "/Msg/DEPT_NAME";	// 科室名称
-							String parentCodingXpath = "/Msg/SUPERIOR_DEPT_CODE";	// 上级科室代码
-							String action = MQHelper.processDataByXpath(document, actionXpath);
-							String coding = MQHelper.processDataByXpath(document, codingXpath);
-							String name = MQHelper.processDataByXpath(document, nameXpath);
-							String parentCoding = MQHelper.processDataByXpath(document, parentCodingXpath);
-							// 构建科室VO
-							OrgUnitVo orgUnitVo = new OrgUnitVo();
-							orgUnitVo.setCoding(coding);
-							orgUnitVo.setName(name);
-							orgUnitVo.setParentCoding(parentCoding);
-							if("insert".equals(action) || "update".equals(action)){
-								orgUnitVoList.add(orgUnitVo);
-							}else{
-								logger.debug("成功接收科室同步的数据！action = " + action + " 不同步科室！");
-							}
+						String actionXpath = msgXpath + "/@action";	//action判断增、删、改
+						String codingXpath = msgXpath + "/DEPT_CODE";	// 科室代码
+						String nameXpath = msgXpath + "/DEPT_NAME";	// 科室名称
+						String parentCodingXpath = msgXpath + "/SUPERIOR_DEPT_CODE";	// 上级科室代码
+						String action = MQHelper.processDataByXpath(doc, actionXpath);
+						String coding = MQHelper.processDataByXpath(doc, codingXpath);
+						String name = MQHelper.processDataByXpath(doc, nameXpath);
+						String parentCoding = MQHelper.processDataByXpath(doc, parentCodingXpath);
+						// 构建科室VO
+						OrgUnitVo orgUnitVo = new OrgUnitVo();
+						orgUnitVo.setCoding(coding);
+						orgUnitVo.setName(name);
+						orgUnitVo.setParentCoding(parentCoding);
+						if("insert".equals(action) || "update".equals(action)){
+							orgUnitVoList.add(orgUnitVo);
 						}else{
-							logger.info("找不到/ESBEntry/MsgInfo/Msg节点内容为空！");
+							logger.debug("成功接收科室同步的数据！action = " + action + " 不同步科室！");
 						}
 					}
 					OrgUnitVo[] allVos = new OrgUnitVo[orgUnitVoList.size()];
@@ -175,9 +174,10 @@
 	 */
 	@SuppressWarnings("deprecation")
 	private void buildUserSyncListener () {
+		logger.info("监听用户EQ.S17.PS02018.COLLECT队列");
 		EwellServiceTool ewellServiceTool = new EwellServiceTool();
         try {
-            ewellServiceTool.buildTopicListener(MQHelper.queueManagerName, "EQ.S17.PS02018.COLLECT", "S17", new MessageHandler() {
+            ewellServiceTool.buildTopicListener(MQHelper.ORGANDUSERQUEUEMANAGERNAME, "EQ.S17.PS02018.COLLECT", "S17", new MessageHandler() {
                 @Override
                 public void onMessage(MessageEntity messageEntity) {
                 	if(messageEntity != null){
@@ -205,6 +205,9 @@
 	 * 解析用户信息
 	 */
 	private void synchAllUserVoData(String userString) {
+		/*String userResult = "<ESBEntry><MessageHeader><Fid>PS02018</Fid><HospCode>DG01</HospCode><OrderNo>PS02018S17001</OrderNo><SourceSysCode>S92</SourceSysCode><TargetSysCode>S17</TargetSysCode><ReturnFlag>-1</ReturnFlag><MsgDate>2020-12-11 10:32:14</MsgDate></MessageHeader><MsgInfo>"
+				+ "<Msg action=\"update\" lastUpdate=\"2020-12-11 10:32:14\"><CREATE_USER>admin</CREATE_USER><CREATE_TIME>2020-11-26 19:04:23</CREATE_TIME><UPDATE_USER>admin</UPDATE_USER><UPDATE_TIME>2020-12-11 10:32:03</UPDATE_TIME><STAFF_INDEX_NO>10557</STAFF_INDEX_NO><STAFF_CODE>0004</STAFF_CODE><STAFF_NAME>何炎燊</STAFF_NAME><PINYIN_CODE>HYS</PINYIN_CODE><WUBI_CODE>WO</WUBI_CODE><ID_NUMBER/><DATE_BIRTH>1972-11-06 00:00:00</DATE_BIRTH><PHYSI_SEX_CODE>1</PHYSI_SEX_CODE><PHYSI_SEX_NAME>男</PHYSI_SEX_NAME><NATION_CODE/><NATION_NAME/><ETHNIC_CODE/><ETHNIC_NAME/><MARITAL_STATUS_CODE/><MARITAL_STATUS_NAME/><EDUCATION_CODE/><EDUCATION_NAME/><HUKOU_ADDR/><PHONE_NO/><CURR_ADDR/><PHONE_NO_HOME/><NATIVE_ADDR/><PHONE_NO_OFFICE/><DEF_DEPT_CODE>10010605</DEF_DEPT_CODE><DEF_DEPT_NAME>总院门诊开单</DEF_DEPT_NAME><SUBOR_DEPT_CODE>10010605</SUBOR_DEPT_CODE><SUBOR_DEPT_NAME>总院门诊开单</SUBOR_DEPT_NAME><BUILD_FILE_DATE/><EMAIL/><STAFF_CATEG_CODE>1</STAFF_CATEG_CODE><STAFF_CATEG_NAME>医生</STAFF_CATEG_NAME><MAJOR_SKILL_POST_CODE/><MAJOR_SKILL_POST_NAME/><TITLE_LEVEL_CODE/><TITLE_LEVEL_NAME/><LOGIN_NAME/><LOGIN_PASSWORD/><ACTIVITY_FLAG/><INVALID_FLAG>0</INVALID_FLAG><VERSION_NUMBER>882</VERSION_NUMBER></Msg>"
+				+ "</MsgInfo></ESBEntry>";*/
 		try {
 			// 解析入库
 			if (StringUtils.isNotBlank(userString)) {
@@ -219,29 +222,23 @@
 					List<UserVo> userVoList = new ArrayList<UserVo>();
 					for (int i = 1; i <= nodeList2.size(); i++) {
 						String msgXpath = "/ESBEntry/MsgInfo/Msg[" + i + "]";
-						String userInfo = MQHelper.processDataByXpath(doc, msgXpath); // 用户信息
-						if(StringUtils.isNotBlank(userInfo)){
-							Document document = DocumentHelper.parseText(userInfo);
-							String actionXpath = "/Msg/@action";	//action判断增、删、改
-							String codeXpath = "/Msg/STAFF_CODE";	// 职工工号
-							String staffNameXpath = "/Msg/STAFF_NAME";	// 职工姓名
-							String orgUnitCodingXpath = "/Msg/SUBOR_DEPT_CODE";	// 从属科室代码
-							String action = MQHelper.processDataByXpath(document, actionXpath);
-							String staffCode = MQHelper.processDataByXpath(document, codeXpath);
-							String staffName = MQHelper.processDataByXpath(document, staffNameXpath);
-							String orgUnitCoding = MQHelper.processDataByXpath(document, orgUnitCodingXpath);
-							// 构建人员VO
-							UserVo userVo = new UserVo();
-							userVo.setCoding(staffCode);
-							userVo.setName(staffName);
-							userVo.setDeptCode(orgUnitCoding);
-							if("insert".equals(action) || "update".equals(action)){
-								userVoList.add(userVo);
-							}else{
-								logger.debug("成功接收人员同步的数据！action = " + action + " 不同步人员！");
-							}
+						String actionXpath = msgXpath + "/@action";	//action判断增、删、改
+						String codeXpath = msgXpath + "/STAFF_CODE";	// 职工工号
+						String staffNameXpath = msgXpath + "/STAFF_NAME";	// 职工姓名
+						String orgUnitCodingXpath = msgXpath + "/SUBOR_DEPT_CODE";	// 从属科室代码
+						String action = MQHelper.processDataByXpath(doc, actionXpath);
+						String staffCode = MQHelper.processDataByXpath(doc, codeXpath);
+						String staffName = MQHelper.processDataByXpath(doc, staffNameXpath);
+						String orgUnitCoding = MQHelper.processDataByXpath(doc, orgUnitCodingXpath);
+						// 构建人员VO
+						UserVo userVo = new UserVo();
+						userVo.setCoding(staffCode);
+						userVo.setName(staffName);
+						userVo.setDeptCode(orgUnitCoding);
+						if("insert".equals(action) || "update".equals(action)){
+							userVoList.add(userVo);
 						}else{
-							logger.info("找不到/ESBEntry/MsgInfo/Msg节点内容为空！");
+							logger.debug("成功接收人员同步的数据！action = " + action + " 不同步人员！");
 						}
 					}
 					UserVo[] allVos = new UserVo[userVoList.size()];
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQHelper.java
===================================================================
diff -u -r29626 -r29887
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQHelper.java	(.../MQHelper.java)	(revision 29626)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQHelper.java	(.../MQHelper.java)	(revision 29887)
@@ -42,6 +42,11 @@
 	public static String queueManagerName = "QMGR.S17";
 	
 	/**
+	 * 科室人员同步队列管理器名称
+	 */
+	public static String ORGANDUSERQUEUEMANAGERNAME = "QMGR.P17";
+	
+	/**
 	 * 获取入院病人信息(东莞中医院)
 	 * 需要发送带有住院号的xml消息到平台，然后平台再返回对应的住院病人信息
 	 * @return