From aff2e801d89621ed4746987574d84724352dedde 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: Fri, 16 Jun 2023 16:49:02 +0800
Subject: [PATCH] =?UTF-8?q?xml=E8=A7=A3=E6=9E=90=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E5=81=87=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/server/collection/util/XmlUtil.java |  2 ++
 .../webservice/impl/BasicServiceImpl.java     | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/docus/server/collection/util/XmlUtil.java b/src/main/java/com/docus/server/collection/util/XmlUtil.java
index 17f60ce..5d035ed 100644
--- a/src/main/java/com/docus/server/collection/util/XmlUtil.java
+++ b/src/main/java/com/docus/server/collection/util/XmlUtil.java
@@ -18,6 +18,7 @@ package com.docus.server.collection.util;
 
 import com.docus.core.util.Exceptions;
 import com.docus.core.util.IoUtil;
+import com.docus.core.util.StringUtil;
 import org.springframework.lang.Nullable;
 import org.w3c.dom.*;
 import org.xml.sax.InputSource;
@@ -90,6 +91,7 @@ public class XmlUtil {
 	 * @return XmlUtil
 	 */
 	public static XmlUtil of(String xmlStr) {
+		xmlStr = StringUtil.replace(xmlStr, "\u00A0", " ");
 		StringReader sr = new StringReader(xmlStr.trim());
 		InputSource inputSource = new InputSource(sr);
 		XmlUtil xmlUtil = create(inputSource);
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 64d3e15..c680201 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
@@ -30,7 +30,7 @@ public class BasicServiceImpl implements BasicService {
 
     @Override
     public String setTBasic(String body) {
-        log.info("新增基础数据：{}", body);
+        log.info("新增入院基础数据：{}", body);
 
         if (Func.isEmpty(body)) {
             return Result.failed(null,"参数为空",null,null);
@@ -51,7 +51,7 @@ public class BasicServiceImpl implements BasicService {
 
     @Override
     public String updateTBasic(String body) {
-        log.info("修改基础数据：{}", body);
+        log.info("修改出院基础数据：{}", body);
         if (Func.isEmpty(body)) {
             return Result.failed(null,"参数为空",null,null);
         }
@@ -94,7 +94,7 @@ public class BasicServiceImpl implements BasicService {
 
     @Override
     public String updateAdmissTBasic(String message) {
-        log.info("修改基础数据：{}", message);
+        log.info("修改入院基础数据：{}", message);
         if (Func.isEmpty(message)) {
             return Result.failed(null,"参数为空",null,null);
         }
@@ -113,7 +113,6 @@ public class BasicServiceImpl implements BasicService {
 
     }
 
-
     public TBasicDto getNewTBasicDto(String str) {
         XmlUtil xml=XmlUtil.of(str);
         //id-消息流水号
@@ -566,11 +565,11 @@ public class BasicServiceImpl implements BasicService {
             wardName=wardNameNode.getTextContent();
         }
         //顺德人医第三方索引
-//        String sdryIndex=null;
-//        Node sdryIndexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
-//        if(Func.isNotEmpty(sdryIndexNode)){
-//            sdryIndex=sdryIndexNode.getNodeValue();
-//        }
+        String sdryIndex=null;
+        Node sdryIndexNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/subject/patient/id/item/@extension");
+        if(Func.isNotEmpty(sdryIndexNode)){
+            sdryIndex=sdryIndexNode.getNodeValue();
+        }
 
         //设置dto
         TBasicDto dto=new TBasicDto();
@@ -590,6 +589,7 @@ public class BasicServiceImpl implements BasicService {
         dto.setBedNum(bedNum);
         dto.setWardCode(wardCode);
         dto.setWardName(wardName);
+        dto.setSdryIndex(sdryIndex);
         return dto;
     }
 
@@ -704,11 +704,11 @@ public class BasicServiceImpl implements BasicService {
             wardName=wardNameNode.getNodeValue();
         }
         //顺德人医第三方索引
-//        String sdryIndex=null;
-//        Node sdryIndexNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
-//        if(Func.isNotEmpty(sdryIndexNode)){
-//            sdryIndex=sdryIndexNode.getNodeValue();
-//        }
+        String sdryIndex=null;
+        Node sdryIndexNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
+        if(Func.isNotEmpty(sdryIndexNode)){
+            sdryIndex=sdryIndexNode.getNodeValue();
+        }
 
         //设置dto
         TBasicDto dto=new TBasicDto();
@@ -730,6 +730,7 @@ public class BasicServiceImpl implements BasicService {
         dto.setSexName(sexName);
         dto.setWardCode(wardCode);
         dto.setWardName(wardName);
+        dto.setSdryIndex(sdryIndex);
         return dto;
     }