Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml =================================================================== diff -u -r35657 -r35684 --- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml (.../replicaJmsIbmListener.xml) (revision 35657) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml (.../replicaJmsIbmListener.xml) (revision 35684) @@ -61,7 +61,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -153,7 +153,7 @@ - + Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml =================================================================== diff -u -r35657 -r35684 --- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml (.../primaryJmsIbmListener.xml) (revision 35657) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml (.../primaryJmsIbmListener.xml) (revision 35684) @@ -61,7 +61,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -153,7 +153,7 @@ - + Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java =================================================================== diff -u -r35657 -r35684 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 35657) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 35684) @@ -1252,17 +1252,19 @@ List performerNodeList = performerNodeXpath.selectNodes(document, performerNodeXpath); if(CollectionUtils.isNotEmpty(performerNodeList)){ for(int j=1;j<=performerNodeList.size();j++){ - String roleNameXapth = performerNodeXpathStr + "[" + j + "]/s:assignedPerson/s:code/s:displayName/@value"; + //角色名称 + String roleNameXapth = performerNodeXpathStr + "[" + j + "]/s:functionCode/s:displayName/@value"; String roleName = processDataByXpath(document, nameSpaceURIMap, roleNameXapth); + //人员姓名 String staffNameXpath = performerNodeXpathStr + "[" + j + "]/s:assignedPerson/s:assignedPerson/s:name/s:item/s:part/@value"; String staffName = processDataByXpath(document, nameSpaceURIMap, staffNameXpath); if(StringUtils.isBlank(roleName)){ - roleNameXapth = performerNodeXpathStr + "[" + j + "]/s:functionCode/s:displayName/@value"; + roleNameXapth = performerNodeXpathStr + "[" + j + "]/s:assignedPerson/s:code/s:displayName/@value"; roleName = processDataByXpath(document, nameSpaceURIMap, roleNameXapth); } if(StringUtils.equals(roleName, "巡回护士")){ circuitNurse = staffName; - }else if(StringUtils.equals(roleName, "手术助手")){ + }else if(StringUtils.equals(roleName, "洗手护士")){ washHandNurse = staffName; }else if(StringUtils.equals(roleName, "主刀医生")){ doctorName = staffName;