From ff2ffa8dd04832d736cab35db15f44323152d37f Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Wed, 12 Jan 2022 13:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=8A=9F=E8=83=BD=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dataConfig/homeQualitySet.json                |  2 +-
 src/main/java/com/docus/bgts/enums/Codes.java | 16 +-------
 .../docus/bgts/handler/TBasicWebService.java  | 39 ++++++++++++++++---
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json
index f67d105..77b3dbc 100644
--- a/dataConfig/homeQualitySet.json
+++ b/dataConfig/homeQualitySet.json
@@ -37,7 +37,7 @@
   "isJudge":"0",
   //判断标签存在目录，首个标签不填
   "judgeDirectory":[""],
-  //判定标签
+  //判定标签,值0-新增；1-撤回；2-修改
   "judgeIndex":"",
 
 
diff --git a/src/main/java/com/docus/bgts/enums/Codes.java b/src/main/java/com/docus/bgts/enums/Codes.java
index 45db107..cf14867 100644
--- a/src/main/java/com/docus/bgts/enums/Codes.java
+++ b/src/main/java/com/docus/bgts/enums/Codes.java
@@ -8,14 +8,6 @@ public enum Codes {
     SUCCESS("1", "成功"),
     //接口失败
     ERROR("0", "失败"),
-    //web service返回根节点
-    RESPONSE("100","Response"),
-    //web service返回二级节点
-    RET_INFO("101","Result"),
-    //web service 返回代码
-    RET_CODE("102","Code"),
-    //web service返回描述部分
-    RET_CON("103","Msg"),
     //静态文件存放位置
     JSON_ADDRESS("999","\\dataConfig\\homeQualitySet.json"),
     //接收二级节点
@@ -26,13 +18,7 @@ public enum Codes {
     UPLOAD("0","uploadConnector"),
     REPOAL("0","repoalConnector"),
     //患者主索引号
-    EMP_ID("0","indexFlag"),
-    //错误日志编号
-    ERROR_CODE("500","12"),
-    //接收三级节点
-//    PAT_INFO("202","PatInfo"),
-    //静态文件根元素名
-    SELECT_COLUMNS("10000","selectColumns")
+    EMP_ID("0","indexFlag")
     ;
     //代码
     private String code;
diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
index e252306..de6cd6b 100644
--- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java
+++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
@@ -69,11 +69,6 @@ public class TBasicWebService implements ITBasicWebService {
             xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + xml;
             //解析XML
             XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(xml.getBytes("UTF-8")));
-            // 获取患者主索引号
-            String empId = String.valueOf(FileUtils.getJsonByName(Codes.EMP_ID.getMessage()));
-            Map<String, Object> headMap = new HashMap<>();
-            headMap.put("Content-Type", "application/json");
-            ReportDownDto reportDownDto;
             //获取数据存在的节点节点
             Element elementRoot = xmlUtils.getMsgElement();
             //key
@@ -81,6 +76,40 @@ public class TBasicWebService implements ITBasicWebService {
 //            String empId = String.valueOf(FileUtils.getJsonByName("indexFlag"));
             String filetitleKey = String.valueOf(FileUtils.getJsonByName("filetitle"));
             String downurlKey = String.valueOf(FileUtils.getJsonByName("downurl"));
+            // 获取患者主索引号
+            String empId = String.valueOf(FileUtils.getJsonByName(Codes.EMP_ID.getMessage()));
+            //判断是否为撤销
+            String isJudge = String.valueOf(FileUtils.getJsonByName("isJudge"));
+            if (StringUtils.isBlank(isJudge) || isJudge.equals("0")) {
+
+            } else {
+                //获取撤回路径
+                List<String> judgeDirectory = (List<String>) FileUtils.getJsonByName("judgeDirectory");
+                Element current = xmlUtils.getElement(judgeDirectory);
+                //获取撤回标签
+                String judgeIndex = String.valueOf(FileUtils.getJsonByName("judgeIndex"));
+                Element judgeIndexElement = current.element(judgeIndex);
+                if (judgeIndexElement == null || StringUtils.isBlank(judgeIndexElement.getText()) || (!judgeIndexElement.getText().equals("1"))) {
+                    logger.info("------新增/修改------");
+                } else if (judgeIndexElement.getText().equals("1")) {
+                    logger.info("---------撤回--------");
+
+                    CanlcelDto canlcelDto = new CanlcelDto();
+                    String serialnum = String.valueOf(FileUtils.getJsonByName("serialnum"));
+                    Element serialnumElement = elementRoot.element(serialnum);
+                    if (serialnumElement != null || StringUtils.isBlank(serialnumElement.getText())) {
+                        throw new RuntimeException("撤回操作时：" + serialnum + "标签不能为空！");
+                    }
+                    canlcelDto.setSerialnum(serialnumElement.getText());
+                    //调用上传服务撤销功能
+                    afCollectTaskService.invokeRepoalFile(canlcelDto);
+                    logger.info("----------当前操作完成--------------");
+                }
+            }
+
+            Map<String, Object> headMap = new HashMap<>();
+            headMap.put("Content-Type", "application/json");
+            ReportDownDto reportDownDto;
 
             ReportDownScanFileDto reportDownScanFileDto;
             ReportDownPatientDto reportDownPatientDto;