Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/bootstrap.yml

pom.xml

@@ -180,6 +180,11 @@
             <artifactId>com.ibm.mq.allclient</artifactId>
             <version>9.1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
     <build>

src/main/java/com/docus/server/collection/receiver/MzZyMqReceiver.java

@@ -64,7 +64,7 @@ public class MzZyMqReceiver {
      * 订阅队列（变更人员）
      * @param message 人员信息
      */
-    @JmsIbmListener(destination = "TJ_updatePractitione")
+    @JmsIbmListener(destination = "TJ_updatePractitioner")
     public void revUpdatePractitioner(String message){
         log.info("人员变更 队列接收信息：{}",message);
         UserDto userDto=MzZyParser.parseUpdateUser(message);

src/main/java/com/docus/server/collection/xml/parsers/MzZyParser.java

@@ -1,7 +1,9 @@
 package com.docus.server.collection.xml.parsers;
 
+import com.docus.core.util.XmlUtil;
 import com.docus.server.collection.dto.DeptDto;
 import com.docus.server.collection.dto.UserDto;
+import org.w3c.dom.Node;
 
 /**
  * 梅州中医 XML 解析
@@ -9,23 +11,73 @@ import com.docus.server.collection.dto.UserDto;
  */
 public class MzZyParser {
     public static DeptDto parseCreateDept(String xml){
+        XmlUtil xmlParseUtil = XmlUtil.of(xml);
+        Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension");
+        Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value");
+        Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension");
+        Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value");
 
-        return null;
+        DeptDto deptDto = new DeptDto();
+        deptDto.setDeptCode(deptCodeNode.getNodeValue());
+        deptDto.setDeptName(deptNameNode.getNodeValue());
+        deptDto.setAuthorId(authorIdNode.getNodeValue());
+        deptDto.setAuthorName(authorNameNode.getNodeValue());
+        return deptDto;
     }
 
     public static DeptDto parseUpdateDept(String xml){
+        XmlUtil xmlParseUtil = XmlUtil.of(xml);
+        Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension");
+        Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value");
+        Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension");
+        Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value");
 
-        return null;
+        DeptDto deptDto = new DeptDto();
+        deptDto.setDeptCode(deptCodeNode.getNodeValue());
+        deptDto.setDeptName(deptNameNode.getNodeValue());
+        deptDto.setAuthorId(authorIdNode.getNodeValue());
+        deptDto.setAuthorName(authorNameNode.getNodeValue());
+        return deptDto;
     }
 
     public static UserDto parseCreateUser(String xml){
+        XmlUtil xmlParseUtil = XmlUtil.of(xml);
+        Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension");
+        Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value");
+        Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension");
+        Node positionNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value");
+        Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension");
+        Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value");
 
-        return null;
+        UserDto userDto = new UserDto();
+        userDto.setDeptId(deptCodeNode.getNodeValue());
+        userDto.setUserName(employeeCodeNode.getNodeValue());
+        userDto.setName(employeeNameNode.getNodeValue());
+        userDto.setPosition(positionNode.getNodeValue());
+        userDto.setAuthorId(authorIdNode.getNodeValue());
+        userDto.setAuthorName(authorNameNode.getNodeValue());
+        userDto.setRoleId(0L);
+        return userDto;
     }
 
 
     public static UserDto parseUpdateUser(String xml){
+        XmlUtil xmlParseUtil = XmlUtil.of(xml);
+        Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension");
+        Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value");
+        Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension");
+        Node positionNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value");
+        Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension");
+        Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value");
 
-        return null;
+        UserDto userDto = new UserDto();
+        userDto.setDeptId(deptCodeNode.getNodeValue());
+        userDto.setUserName(employeeCodeNode.getNodeValue());
+        userDto.setName(employeeNameNode.getNodeValue());
+        userDto.setPosition(positionNode.getNodeValue());
+        userDto.setAuthorId(authorIdNode.getNodeValue());
+        userDto.setAuthorName(authorNameNode.getNodeValue());
+        userDto.setRoleId(0L);
+        return userDto;
     }
 }

src/main/resources/bootstrap.yml

@@ -77,16 +77,29 @@ TBasic:
 #  url: http://199.168.91.110:7800/roc/curr-web/api/v1/common/in-patient/query
 
 
+# com.ibm.mq连接方式（集群模式需要配置两个地址）  本地测试
+#ibm:
+#  mq:
+#    queueManager: MqManager01
+#    channel: chl_server01
+#    connName: 127.0.0.1(1414)
+#    ackUrl: http://127.0.0.1:7800/ack
+#    domain: CDR
+#    key: cdr-0012-adef
+#    replica:
+#      queueManager: MqManager02
+#      channel: chl_server02
+#      connName: 127.0.0.1(1415)
 # com.ibm.mq连接方式（集群模式需要配置两个地址）
 ibm:
   mq:
     queueManager: MqManager01
     channel: chl_server01
-    connName: 127.0.0.1(1414)
+    connName: 10.222.23.130(1414)
-    ackUrl: http://127.0.0.1:7800/ack
+    ackUrl: 10.222.23.159:7800/ack
     domain: CDR
     key: cdr-0012-adef
     replica:
       queueManager: MqManager02
       channel: chl_server02
-      connName: 127.0.0.1(1415)
+      connName: 10.222.23.131(1414)