From 8c1807c7149776a180332b63abe5be2dbd975251 Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Mon, 17 Jan 2022 15:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/bgts/handler/TBasicWebService.java     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
index f497b7e..a6bfa61 100644
--- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java
+++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
@@ -63,9 +63,6 @@ public class TBasicWebService implements ITBasicWebService {
         try {
             logger.info("报告推送入参：" + xml);
             // 1、创建document对象
-//            Document document = DocumentHelper.createDocument();
-//            Element rootElement = getElementFromString(xml);
-//            document.setRootElement(rootElement);
             xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + xml;
             //解析XML
             XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(xml.getBytes("UTF-8")));
@@ -73,7 +70,6 @@ public class TBasicWebService implements ITBasicWebService {
             Element elementRoot = xmlUtils.getMsgElement();
             //key
             String serialnmnKey = String.valueOf(FileUtils.getJsonByName("serialnum"));
-//            String empId = String.valueOf(FileUtils.getJsonByName("indexFlag"));
             String filetitleKey = String.valueOf(FileUtils.getJsonByName("filetitle"));
             String downurlKey = String.valueOf(FileUtils.getJsonByName("downurl"));
             // 获取患者主索引号
@@ -118,8 +114,6 @@ public class TBasicWebService implements ITBasicWebService {
             String filetitle;
             String downurl;
             String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
-//            String collectorid = getCollectorid(elementList.get(0));
-//            String assortid = String.valueOf(FileUtils.getJsonByName("assortid"));
             String assortid = getAssortid(elementRoot);
             reportDownDto = new ReportDownDto();
             reportDownDto.setCollectorid(collectorid);
@@ -127,7 +121,6 @@ public class TBasicWebService implements ITBasicWebService {
             //获取基本数据信息
             List<ReportDownScanFileDto> reportDownDtoArr = new ArrayList<>();
             reportDownPatientDto = new ReportDownPatientDto();
-//            String empIdText = elementList.get(0).element(empId).getText();
             //获取jzh
             String empIdText = getElementText(elementRoot, empId.split(","));
             //获取采集流水号
@@ -138,10 +131,7 @@ public class TBasicWebService implements ITBasicWebService {
             List<Element> elementList = xmlUtils.getJsonByName(elementRoot);
 
             for (Element element : elementList) {
-//                serialnum = element.element(serialnmnKey).getText();
-//                filetitle = element.element(filetitleKey).getText();
                 filetitle = getElementText(element, filetitleKey.split(","));
-//                downurl = element.element(downurlKey).getText();
                 downurl = getElementText(element, downurlKey.split(","));
                 downurl = handleDownUrl(downurl);
                 reportDownScanFileDto = new ReportDownScanFileDto();
@@ -312,6 +302,8 @@ public class TBasicWebService implements ITBasicWebService {
 
                     if (byElement1 != null && StringUtils.isNotBlank(byElement1.getText())) {
                         break;
+                    }else {
+                        byElement1=null;
                     }
                 }
             } else {