From 8230da9dd3136845fc394d196a418eef79af2f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
 <2964346877@qq.com>
Date: Wed, 26 Jul 2023 09:14:07 +0800
Subject: [PATCH] =?UTF-8?q?xml=E8=A7=A3=E6=9E=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webservice/impl/BasicServiceImpl.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
index c680201..3fcbc61 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
@@ -183,13 +183,13 @@ public class BasicServiceImpl implements BasicService {
         }
         //主治医师[]
         String attending=null;
-        Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/id/@extension");
+        Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='住院医师']/assignedEntity/id/@extension");
         if(Func.isNotEmpty(attendingNode)){
             attending=attendingNode.getTextContent();
         }
         //主治医师[]
         String attendingName=null;
-        Node attendingNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/assignedPerson/name");
+        Node attendingNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='住院医师']/assignedEntity/assignedPerson/name");
         if(Func.isNotEmpty(attendingNameNode)){
             attendingName=attendingNameNode.getTextContent();
         }
@@ -359,13 +359,13 @@ public class BasicServiceImpl implements BasicService {
         }
         //主治医师[]
         String attending=null;
-        Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/id/@extension");
+        Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='住院医师']/assignedEntity/id/@extension");
         if(Func.isNotEmpty(attendingNode)){
             attending=attendingNode.getTextContent();
         }
         //主治医师[]
         String attendingName=null;
-        Node attendingNameNode = xml.getNode("/PRPA_HIP0033/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/assignedPerson/name");
+        Node attendingNameNode = xml.getNode("/PRPA_HIP0033/controlActProcess/subject/encounterEvent/authenticator[@displayName='住院医师']/assignedEntity/assignedPerson/name");
         if(Func.isNotEmpty(attendingNameNode)){
             attendingName=attendingNameNode.getTextContent();
         }
@@ -523,13 +523,13 @@ public class BasicServiceImpl implements BasicService {
         }
         //主治医师[]
         String attending=null;
-        Node attendingNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/execute/assignedEntity/id/item/@extension");
+        Node attendingNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/admitter/assignedPerson/id/item/@extension");
         if(Func.isNotEmpty(attendingNode)){
             attending=attendingNode.getTextContent();
         }
         //主治医师名称[]
         String attendingName=null;
-        Node attendingNameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/execute/assignedEntity/assignedPerson/name/item/part/@value");
+        Node attendingNameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/admitter/assignedPerson/assignedPerson/name/item/part/@value");
         if(Func.isNotEmpty(attendingNameNode)){
             attendingName=attendingNameNode.getTextContent();
         }
@@ -657,13 +657,13 @@ public class BasicServiceImpl implements BasicService {
         }
         //主治医师[]
         String attending=null;
-        Node attendingNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/id/item/@extension");
+        Node attendingNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/code[@displayName='住院医师']/parent::assignedEntity/id/item/@extension");
         if(Func.isNotEmpty(attendingNode)){
             attending=attendingNode.getNodeValue();
         }
         //主治医师[]
         String attendingName=null;
-        Node attendingNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/assignedPerson/name");
+        Node attendingNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/code[@displayName='住院医师']/parent::assignedEntity/assignedPerson/name");
         if(Func.isNotEmpty(attendingNameNode)){
             attendingName=attendingNameNode.getTextContent();
         }