顺德人医报告 api

data-config/js-table-type.json

@@ -2,5 +2,8 @@
   "icu": "重症文件分段id",
   "sa": "手麻文件分段id",
   "examination": "检验报告文件分段id",
+  "BL-001": "病理文件分段id",
+  "CS-001": "超声文件分段id",
+  "petct": "petct文件分段id",
   "other": "其他文件分段id"
 }

data-config/sdry-pacs-server.json

@@ -0,0 +1,13 @@
+{
+    "url":"http:/192.168.5.55:8090/PacsService.wsdl",
+    "interval": 1000,
+    "namespaceUri":"com.docus",
+    "operationName":"Service",
+    "functionName":"ReportServerDll.GetPdfReport",
+    "functionType":"",
+    "caller":"外面的配置",
+    "licenseInfo":{
+        "caller":"里面的调用",
+        "license":"令牌**************"
+    }
+}

src/main/java/com/docus/server/report/api/DownPlatformService.java

@@ -0,0 +1,22 @@
+package com.docus.server.report.api;
+
+import com.docus.infrastructure.web.api.CommonResult;
+import com.docus.server.report.api.dto.ReportDownDto;
+
+/**
+ * 下载平台服务接口
+ *
+ * @author jiashi
+ */
+
+public interface DownPlatformService {
+
+
+    /**
+     * 下载服务文件上报
+     *
+     * @param reportDownDto 下载服务上报参数
+     * @return 结果
+     */
+    CommonResult report(ReportDownDto reportDownDto);
+}

src/main/java/com/docus/server/report/api/ShunDePeopleService.java

@@ -0,0 +1,26 @@
+package com.docus.server.report.api;
+
+import java.util.List;
+
+/**
+ * 顺德人医调用
+ *
+ * @author wyb
+ */
+public interface ShunDePeopleService {
+    /**
+     * 根据顺德人医第三方索引查询报告交叉索引
+     *
+     * @param sdRyIndex 顺德人医第三方索引
+     * @return 报告交叉索引
+     */
+    List<String> getSdRyReportPatientIds(String sdRyIndex);
+
+    /**
+     * 根据检查流水或和报告序列号，指定要获取的报告，PACS将生成PDF格式的报告，并将PDF文件的BASE64编码串返回。
+     * @param examNo 检查流水号
+     * @param reportNo 报告序号
+     * @return pdfBase64
+     */
+    String getBase64PdfFromPacs(String examNo,String reportNo);
+}

src/main/java/com/docus/server/report/api/TaskDistributeService.java

@@ -0,0 +1,21 @@
+package com.docus.server.report.api;
+
+import com.docus.server.report.api.dto.ReportDownTwoDto;
+
+/**
+ * 无视图任务服务
+ *
+ * @author wyb
+ */
+
+public interface TaskDistributeService {
+
+
+    /**
+     * 无视图-根据采集器类型获取任务信息
+     *
+     * @param collectorId 采集器类型
+     * @return 任务信息
+     */
+    ReportDownTwoDto getNoviewTaskByCollectorId(String collectorId);
+}

src/main/java/com/docus/server/report/api/dto/ReportDownDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.dto;
+package com.docus.server.report.api.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/report/api/dto/ReportDownPatientDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.dto;
+package com.docus.server.report.api.dto;
 
 import com.docus.server.report.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/report/api/dto/ReportDownScanFileDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.dto;
+package com.docus.server.report.api.dto;
 
 import com.docus.server.report.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/report/api/dto/ReportDownTwoDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.noviwtask.dto;
+package com.docus.server.report.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/report/api/dto/ReportDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.dto;
+package com.docus.server.report.api.dto;
 
 import lombok.Data;
 

src/main/java/com/docus/server/report/api/dto/ReportHospitalTwoDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.noviwtask.dto;
+package com.docus.server.report.api.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/report/api/dto/ReportPatientTwoDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.noviwtask.dto;
+package com.docus.server.report.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/docus/server/report/api/dto/ReportTaskTwoDto.java

@@ -1,4 +1,4 @@
-package com.docus.server.report.noviwtask.dto;
+package com.docus.server.report.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/docus/server/report/api/dto/SdPacsServerConfig.java

@@ -0,0 +1,120 @@
+package com.docus.server.report.api.dto;
+
+public class SdPacsServerConfig {
+    private String url;
+    private String namespaceUri;
+    private String operationName;
+    private String functionName;
+    private String functionType;
+    private String caller;
+    private LicenseInfo licenseInfo;
+    private int interval;
+
+    @Override
+    public String toString() {
+        return "SdPacsServerConfig{" +
+                "url='" + url + '\'' +
+                ", namespaceUri='" + namespaceUri + '\'' +
+                ", operationName='" + operationName + '\'' +
+                ", functionName='" + functionName + '\'' +
+                ", functionType='" + functionType + '\'' +
+                ", caller='" + caller + '\'' +
+                ", licenseInfo=" + licenseInfo +
+                ", interval=" + interval +
+                '}';
+    }
+
+    public int getInterval() {
+        return interval;
+    }
+
+    public void setInterval(int interval) {
+        this.interval = interval;
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
+    public String getNamespaceUri() {
+        return namespaceUri;
+    }
+
+    public void setNamespaceUri(String namespaceUri) {
+        this.namespaceUri = namespaceUri;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getFunctionName() {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName) {
+        this.functionName = functionName;
+    }
+
+    public String getFunctionType() {
+        return functionType;
+    }
+
+    public void setFunctionType(String functionType) {
+        this.functionType = functionType;
+    }
+
+    public String getCaller() {
+        return caller;
+    }
+
+    public void setCaller(String caller) {
+        this.caller = caller;
+    }
+
+    public LicenseInfo getLicenseInfo() {
+        return licenseInfo;
+    }
+
+    public void setLicenseInfo(LicenseInfo licenseInfo) {
+        this.licenseInfo = licenseInfo;
+    }
+
+    public static class LicenseInfo {
+        private String caller;
+        private String license;
+
+        public String getCaller() {
+            return caller;
+        }
+
+        public void setCaller(String caller) {
+            this.caller = caller;
+        }
+
+        public String getLicense() {
+            return license;
+        }
+
+        public void setLicense(String license) {
+            this.license = license;
+        }
+
+        @Override
+        public String toString() {
+            return "LicenseInfo{" +
+                    "caller='" + caller + '\'' +
+                    ", license='" + license + '\'' +
+                    '}';
+        }
+    }
+}

src/main/java/com/docus/server/report/api/impl/DownPlatformServiceImpl.java

@@ -0,0 +1,69 @@
+package com.docus.server.report.api.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.docus.core.util.Func;
+import com.docus.infrastructure.web.api.CommonResult;
+import com.docus.server.report.api.DownPlatformService;
+import com.docus.server.report.api.dto.ReportDownDto;
+import com.docus.server.report.config.ApplicationBusinessConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * 下载平台服务接口
+ *
+ * @author jiashi
+ */
+@Component
+@Slf4j
+public class DownPlatformServiceImpl implements DownPlatformService {
+    @Resource
+    private ApplicationBusinessConfig applicationBusinessConfig;
+
+    @Override
+    public CommonResult report(ReportDownDto reportDownDto) {
+        String downUrl = applicationBusinessConfig.getDownUrl();
+        if (Func.isBlank(downUrl)) {
+            log.warn("文件上报地址未配置！");
+            return null;
+        }
+        String requestId = Func.randomUUID();
+        String requestParam = Func.toJson(reportDownDto);
+        try {
+            log.info("[{}]调用下载服务，地址：{} ，参数：{}", requestId, downUrl, requestParam);
+            String respBody = post(downUrl, requestParam);
+            log.info("[{}]调用下载服务成功,响应参数：{}", requestId, respBody);
+            return Func.readJson(respBody, CommonResult.class);
+        } catch (Exception ex) {
+            log.error("[" + requestId + "]调用下载服务失败" + ex.getMessage(), ex);
+            return CommonResult.failed(ex.getMessage());
+        }
+
+    }
+
+    /**
+     * 文件上报加锁
+     */
+    private final static Lock REPORT_LOCK = new ReentrantLock();
+
+    public String post(String url, String body) {
+        REPORT_LOCK.lock();
+        try {
+            HttpRequest post = HttpUtil.createPost(url);
+            post.setConnectionTimeout(5 * 1000);
+            post.setReadTimeout(60 * 1000);
+            post.header("Content-Type", "application/json; charset=utf-8");
+            post.body(body);
+            HttpResponse response = post.execute();
+            return response.body();
+        }finally {
+            REPORT_LOCK.unlock();
+        }
+    }
+}

src/main/java/com/docus/server/report/api/impl/ShunDePeopleServiceImpl.java

@@ -0,0 +1,208 @@
+package com.docus.server.report.api.impl;
+
+import com.docus.core.util.DateUtil;
+import com.docus.core.util.Func;
+import com.docus.server.report.api.ShunDePeopleService;
+import com.docus.server.report.api.dto.SdPacsServerConfig;
+import com.docus.server.report.client.JaxWsDynamicClient;
+import com.docus.server.report.config.SdRyReportQueryConfig;
+import com.docus.server.report.util.IdUtil;
+import com.docus.server.report.util.TableJsonRead;
+import com.docus.server.report.util.XmlUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * 顺德人医调用
+ *
+ * @author wyb
+ */
+@Component
+@Slf4j
+public class ShunDePeopleServiceImpl implements ShunDePeopleService {
+    private static final Lock INDEX_LOCK = new ReentrantLock();
+    private static final Lock PACS_PDF_LOCK = new ReentrantLock();
+    @Resource
+    private SdRyReportQueryConfig sdRyReportQueryConfig;
+
+    public static void main(String[] args) {
+        ShunDePeopleServiceImpl shunDePeopleService = new ShunDePeopleServiceImpl();
+        String base64PdfFromPacs = shunDePeopleService.getBase64PdfFromPacs("121", "1");
+        System.out.println(base64PdfFromPacs);
+    }
+
+    @Override
+    public List<String> getSdRyReportPatientIds(String sdRyIndex) {
+        List<String> indexes = new ArrayList<>();
+        try {
+            String zyParam = organizationQuerySdRyReportIndexParam(sdRyIndex, 3);
+            String mzParam = organizationQuerySdRyReportIndexParam(sdRyIndex, 1);
+            String[] zyParams = {"HIP1179", zyParam};
+            String[] mzParams = {"HIP1179", mzParam};
+            List<String> zyIndex = getIndex(zyParams);
+            indexes.addAll(zyIndex);
+            List<String> mzIndex = getIndex(mzParams);
+            indexes.addAll(mzIndex);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+        return indexes;
+    }
+
+    @Override
+    public String getBase64PdfFromPacs(String examNo, String reportNo) {
+        TableJsonRead jsonRead = new TableJsonRead();
+        SdPacsServerConfig config = jsonRead.Read("data-config", "sdry-pacs-server.json", SdPacsServerConfig.class);
+        String url = config.getUrl();
+        String namespaceUri = config.getNamespaceUri();
+        String operationName = config.getOperationName();
+        String functionType = config.getFunctionType();
+        String functionName = config.getFunctionName();
+        String caller = config.getCaller();
+        int interval = config.getInterval();
+        String inputString = getPdfReportBase64InputString(examNo, reportNo, config);
+        //  参数1（FunctionName）：此参数用于区分不同的场景，具体看每个场景说明
+        //	参数2（InputString）：请求消息串，看具体场景说明
+        //	参数3（FunctionType）：传空，暂未启用
+        //	参数4（Caller）：服务调用者名称，由PACS提供，验证令牌时
+        String[] param = {functionName, inputString, functionType, caller};
+        PACS_PDF_LOCK.lock();
+        try {
+            String result = JaxWsDynamicClient.send(url, namespaceUri, operationName, param);
+            if (interval > 0) {
+                TimeUnit.MILLISECONDS.sleep(interval);
+            }
+            return result;
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return null;
+        } finally {
+            PACS_PDF_LOCK.unlock();
+        }
+    }
+
+    private String getPdfReportBase64InputString(String examNo, String reportNo, SdPacsServerConfig config) {
+        return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<!-- PDF报告请求消息 -->\n" +
+                "<QueryInfo>\n" +
+                "<!-- 调用系统 -->\n" +
+                "\t<LicenseInfo>\n" +
+                "\t\t<!-- 调用系统 -->\n" +
+                "\t\t<Caller>" + config.getLicenseInfo().getCaller() + "</Caller>\n" +
+                "\t\t<!-- 调用令牌（由PACS提供） -->\n" +
+                "\t\t<License>" + config.getLicenseInfo().getLicense() + "</License>\n" +
+                "\t</LicenseInfo>\n" +
+                "\t<!-- 检查流水号 -->\n" +
+                "\t<ExamNo>" + examNo + "</ExamNo>\n" +
+                "\t<!-- 报告序号 -->\n" +
+                "\t<ReportNo>" + reportNo + "</ReportNo>\n" +
+                "</QueryInfo>";
+    }
+
+
+    private List<String> getIndex(String[] params) {
+        INDEX_LOCK.lock();
+        try {
+            String namespaceUri = sdRyReportQueryConfig.getQueryReportIndexWsdlNamespaceUri();
+            String wsdlAddr = sdRyReportQueryConfig.getQueryReportIndexWsdlAddr();
+            String operationName = sdRyReportQueryConfig.getQueryReportIndexWsdlOperationName();
+            String result = JaxWsDynamicClient.send(wsdlAddr, namespaceUri, operationName, params);
+            log.info("查询顺德人医患者交叉索引数据，返回值：{}", result);
+            if (result == null) {
+                return new ArrayList<>();
+            }
+            TimeUnit.MILLISECONDS.sleep(sdRyReportQueryConfig.getQueryReportIndexInterval());
+            return parseQuerySdRyReportIndex(result);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return new ArrayList<>();
+        } finally {
+            INDEX_LOCK.unlock();
+        }
+    }
+
+    private List<String> parseQuerySdRyReportIndex(String result) {
+        try {
+            XmlUtil xmlUtil = XmlUtil.of(result);
+            NodeList nodeList = xmlUtil.getNodeList("/PRPA_HIP1179/controlActProcess/subject/empiIndex/patientIds/patientId");
+            int nodeListLength = nodeList.getLength();
+            ArrayList<String> patientIds = new ArrayList<>();
+            if (nodeListLength > 0) {
+                for (int i = 0; i < nodeListLength; i++) {
+                    Node node = nodeList.item(i);
+                    String patientId = node.getTextContent();
+                    if (Func.isNotBlank(patientId)) {
+                        patientIds.add(patientId);
+                    }
+                }
+            }
+            return patientIds;
+        } catch (Exception ex) {
+            log.error("顺德人医解析患者交叉索引失败。", ex);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 组织顺德人医查询交叉索引的请求参数
+     *
+     * @param sDryIndex 顺德人医关联索引
+     * @param type      1:门诊 3:住院
+     * @return 顺德人医查询交叉索引的请求参数
+     */
+    private String organizationQuerySdRyReportIndexParam(String sDryIndex, int type) {
+        sDryIndex = sDryIndex.toLowerCase()
+                .replace("m", "")
+                .replace("z", "");
+        String receiver = "Orion-001";
+        String sender = "PaperlessManagementMRIS-001";
+        String now = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
+
+        return "<PRPA_HIP1179 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ITSVersion=\"XML_1.0\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3 ../multicacheschemas/PRPA_IN201306UV02.xsd\">\n" +
+                "\t<id root=\"2.16.156.10011.0\" extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
+                "\t<creationTime value=\"" + now + "\"/>\n" +
+                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"PRPA_IHIP1179\"/>\n" +
+                "\t<processingCode code=\"P\"/>\n" +
+                "\t<processingModeCode/>\n" +
+                "\t<acceptAckCode code=\"AL\"/>\n" +
+                "\t<receiver typeCode=\"RCV\">\n" +
+                "\t\t<telecom/>\n" +
+                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+                "\t\t\t<id>\n" +
+                "\t\t\t\t<item root=\"2.16.156.10011.0.1.1\" extension=\"" + receiver + "\"/>\n" +
+                "\t\t\t</id>\n" +
+                "\t\t</device>\n" +
+                "\t</receiver>\n" +
+                "\t<sender typeCode=\"SND\">\n" +
+                "\t\t<telecom/>\n" +
+                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+                "\t\t\t<id>\n" +
+                "\t\t\t\t<item root=\"2.16.156.10011.0.1.2\" extension=\"" + sender + "\"/>\n" +
+                "\t\t\t</id>\n" +
+                "\t\t</device>\n" +
+                "\t</sender>\n" +
+                "\t<controlActProcess classCode=\"CACT\" moodCode=\"EVN\">\n" +
+                "\t\t<code code=\"empiIndexQuery\">\n" +
+                "\t\t\t<displayName value=\"交叉索引查询\"/>\n" +
+                "\t\t</code>\n" +
+                "\t\t<queryByParameter>\n" +
+                "\t\t\t<!-- 查询条件：type：类型 value：值 -->\n" +
+                "\t\t\t<!--type 1:患者id 2:身份证 3::电子健康码-->\n" +
+                "\t\t\t<queryParam type=\"1\" value=\"" + sDryIndex + "\"/>\n" +
+                "\t\t\t<!--1:门诊 3:住院-->\n" +
+                "\t\t\t<visitType type=\"" + type + "\"/>\n" +
+                "\t\t</queryByParameter>\n" +
+                "\t</controlActProcess>\n" +
+                "</PRPA_HIP1179>\n";
+    }
+}

src/main/java/com/docus/server/report/api/impl/TaskDistributeServiceImpl.java

@@ -1,11 +1,12 @@
-package com.docus.server.report.noviwtask;
+package com.docus.server.report.api.impl;
 
 import cn.hutool.http.HttpUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.api.ResultCode;
+import com.docus.server.report.api.TaskDistributeService;
+import com.docus.server.report.api.dto.ReportDownTwoDto;
 import com.docus.server.report.config.ApplicationBusinessConfig;
-import com.docus.server.report.noviwtask.dto.ReportDownTwoDto;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -14,14 +15,18 @@ import javax.annotation.Resource;
 
 /**
  * 无视图任务服务
+ *
  * @author wyb
  */
 @Component
 @Slf4j
-public class NoViewTaskService {
+public class TaskDistributeServiceImpl implements TaskDistributeService {
     @Resource
     private ApplicationBusinessConfig applicationBusinessConfig;
-    public ReportDownTwoDto getTaskByCollectorId(String collectorId){
+
+
+    @Override
+    public ReportDownTwoDto getNoviewTaskByCollectorId(String collectorId) {
         String getTaskUrl = applicationBusinessConfig.getGetTaskUrl();
         if (Func.isBlank(getTaskUrl)) {
             log.warn("获取任务信息地址未配置！");

src/main/java/com/docus/server/report/controller/ReportDownController.java

@@ -6,7 +6,7 @@ import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.server.collection.entity.TBasic;
 import com.docus.server.collection.mapper.TBasicMapper;
 import com.docus.server.report.job.ReportJob;
-import com.docus.server.report.noviwtask.NoViewTaskService;
+import com.docus.server.report.api.TaskDistributeService;
 import com.docus.server.report.service.ReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,12 +33,12 @@ public class ReportDownController {
     @Resource
     ReportJob reportJob;
     @Resource
-private NoViewTaskService noViewTaskService;
+    private TaskDistributeService taskDistributeService;
 
     @ApiOperation(value = "获取任务测试")
     @PostMapping("/getTaskTest")
     public CommonResult<Object> getTaskTest(@RequestParam("collectorId") String collectorId) {
-        return CommonResult.success(noViewTaskService.getTaskByCollectorId(collectorId));
+        return CommonResult.success(taskDistributeService.getNoviewTaskByCollectorId(collectorId));
     }
 
     @ApiOperation(value = " lis 检验 采集 job 测试")
@@ -100,7 +100,6 @@ private NoViewTaskService noViewTaskService;
     }
 
 
-
     @ApiOperation(value = "report lis job 测试", hidden = true)
     @PostMapping("/lisreportJobTest")
     public CommonResult<String> LisreportJobTest() {
@@ -313,7 +312,6 @@ private NoViewTaskService noViewTaskService;
     }
 
 
-
     @ApiOperation(value = "lis检验报告测试地址", hidden = true)
     @PostMapping("/lisTest/query")
     public JSONObject lisTest(@RequestParam("uuid") String uuid,
@@ -442,8 +440,6 @@ private NoViewTaskService noViewTaskService;
     }
 
 
-
-
     @ApiOperation(value = "lis检验报告测试地址", hidden = true)
     @PostMapping("/lisTestNoResult/query")
     public JSONObject lisTestNoResult(@RequestParam("uuid") String uuid,

src/main/java/com/docus/server/report/entity/AfReportRecord.java

@@ -1,8 +1,6 @@
 package com.docus.server.report.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.docus.server.report.api.dto.ReportDto;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.docus.server.report.dto.ReportDto;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/docus/server/report/event/TaskConsumptionReportDownEvent.java

@@ -1,6 +1,6 @@
 package com.docus.server.report.event;
 
-import com.docus.server.report.dto.ReportDto;
+import com.docus.server.report.api.dto.ReportDto;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 

src/main/java/com/docus/server/report/job/ReportJob.java

@@ -10,23 +10,20 @@ import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collection.entity.TBasic;
 import com.docus.server.collection.mapper.TBasicMapper;
-import com.docus.server.report.client.JaxWsDynamicClient;
+import com.docus.server.report.api.ShunDePeopleService;
+import com.docus.server.report.api.TaskDistributeService;
+import com.docus.server.report.api.dto.ReportDownTwoDto;
+import com.docus.server.report.api.dto.ReportDto;
 import com.docus.server.report.config.SdRyReportQueryConfig;
-import com.docus.server.report.dto.ReportDto;
 import com.docus.server.report.entity.AfJobTime;
 import com.docus.server.report.entity.AfReportRecord;
 import com.docus.server.report.mapper.AfJobTimeMapper;
 import com.docus.server.report.mapper.AfReportRecordMapper;
-import com.docus.server.report.noviwtask.NoViewTaskService;
-import com.docus.server.report.noviwtask.dto.ReportDownTwoDto;
 import com.docus.server.report.service.ReportService;
 import com.docus.server.report.util.IdUtil;
-import com.docus.server.report.util.XmlUtil;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import javax.annotation.Resource;
 import java.time.Instant;
@@ -60,12 +57,14 @@ public class ReportJob {
     @Resource
     private SdRyReportQueryConfig sdRyReportQueryConfig;
     @Resource
-    private NoViewTaskService noViewTaskService;
+    private TaskDistributeService taskDistributeService;
+    @Resource
+    private ShunDePeopleService shunDePeopleService;
 
     @XxlJob("SdRyLisCollectJob")
     public void sdRyLisCollectJob() {
         String reportQueryLisCollectorId = sdRyReportQueryConfig.getReportQueryLisCollectorId();
-        ReportDownTwoDto reportDownTwoDto = noViewTaskService.getTaskByCollectorId(reportQueryLisCollectorId);
+        ReportDownTwoDto reportDownTwoDto = taskDistributeService.getNoviewTaskByCollectorId(reportQueryLisCollectorId);
         if (reportDownTwoDto == null) {
             return;
         }
@@ -90,7 +89,7 @@ public class ReportJob {
     @XxlJob("SdRyInspectCollectJob")
     public void sdRyInspectCollectJob() {
         String reportQueryInspectCollectorId = sdRyReportQueryConfig.getReportQueryInspectCollectorId();
-        ReportDownTwoDto reportDownTwoDto = noViewTaskService.getTaskByCollectorId(reportQueryInspectCollectorId);
+        ReportDownTwoDto reportDownTwoDto = taskDistributeService.getNoviewTaskByCollectorId(reportQueryInspectCollectorId);
         if (reportDownTwoDto == null) {
             return;
         }
@@ -568,7 +567,7 @@ public class ReportJob {
         return Func.toJson(map);
     }
 
-    private static Lock indexQueryLock = new ReentrantLock();
+
 
     /**
      * 根据归档病案主键查询报告交叉索引
@@ -577,107 +576,20 @@ public class ReportJob {
      * @return 报告交叉索引
      */
     private List<String> getSdRyReportPatientIds(String patientId) {
-        indexQueryLock.lock();
         try {
             String sDryIndex = tBasicMapper.getSdRyIndexByPatientId(patientId);
             if (Func.isBlank(sDryIndex)) {
-                log.warn("patientId:{} 未关联到第三方索引", patientId);
+                log.warn("归档系统 patientId:{} 未关联到第三方索引", patientId);
                 return new ArrayList<>();
             }
-            String param = organizationQuerySdRyReportIndexParam(sDryIndex);
+            return shunDePeopleService.getSdRyReportPatientIds(sDryIndex);
-            String[] params = {"HIP1179", param};
-            String namespaceUri = sdRyReportQueryConfig.getQueryReportIndexWsdlNamespaceUri();
-            String wsdlAddr = sdRyReportQueryConfig.getQueryReportIndexWsdlAddr();
-            String operationName = sdRyReportQueryConfig.getQueryReportIndexWsdlOperationName();
-            String result = JaxWsDynamicClient.send(wsdlAddr, namespaceUri, operationName, params);
-            log.info("查询顺德人医患者交叉索引数据，返回值：{}", result);
-            if (result == null) {
-                return new ArrayList<>();
-            }
-            TimeUnit.MILLISECONDS.sleep(sdRyReportQueryConfig.getQueryReportIndexInterval());
-            return parseQuerySdRyReportIndex(result);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
             return new ArrayList<>();
-        } finally {
-            indexQueryLock.unlock();
         }
     }
 
-    /**
+
-     * 组织顺德人医查询交叉索引的请求参数
-     *
-     * @param sDryIndex 顺德人医关联索引
-     * @return 顺德人医查询交叉索引的请求参数
-     */
-    private String organizationQuerySdRyReportIndexParam(String sDryIndex) {
-        sDryIndex = sDryIndex.toLowerCase()
-                .replace("m", "")
-                .replace("z", "");
-        String receiver = "Orion-001";
-        String sender = "PaperlessManagementMRIS-001";
-        String now = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
-
-        return "<PRPA_HIP1179 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ITSVersion=\"XML_1.0\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3 ../multicacheschemas/PRPA_IN201306UV02.xsd\">\n" +
-                "\t<id root=\"2.16.156.10011.0\" extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
-                "\t<creationTime value=\"" + now + "\"/>\n" +
-                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"PRPA_IHIP1179\"/>\n" +
-                "\t<processingCode code=\"P\"/>\n" +
-                "\t<processingModeCode/>\n" +
-                "\t<acceptAckCode code=\"AL\"/>\n" +
-                "\t<receiver typeCode=\"RCV\">\n" +
-                "\t\t<telecom/>\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item root=\"2.16.156.10011.0.1.1\" extension=\"" + receiver + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</receiver>\n" +
-                "\t<sender typeCode=\"SND\">\n" +
-                "\t\t<telecom/>\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item root=\"2.16.156.10011.0.1.2\" extension=\"" + sender + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</sender>\n" +
-                "\t<controlActProcess classCode=\"CACT\" moodCode=\"EVN\">\n" +
-                "\t\t<code code=\"empiIndexQuery\">\n" +
-                "\t\t\t<displayName value=\"交叉索引查询\"/>\n" +
-                "\t\t</code>\n" +
-                "\t\t<queryByParameter>\n" +
-                "\t\t\t<!-- 查询条件：type：类型 value：值 -->\n" +
-                "\t\t\t<!--type 1:患者id 2:身份证 3::电子健康码-->\n" +
-                "\t\t\t<queryParam type=\"1\" value=\"" + sDryIndex + "\"/>\n" +
-                "\t\t\t<!--1:门诊 3:住院-->\n" +
-                "\t\t\t<visitType type=\"3\"/>\n" +
-                "\t\t</queryByParameter>\n" +
-                "\t</controlActProcess>\n" +
-                "</PRPA_HIP1179>\n";
-    }
-
-
-    private static List<String> parseQuerySdRyReportIndex(String result) {
-        try {
-            XmlUtil xmlUtil = XmlUtil.of(result);
-            NodeList nodeList = xmlUtil.getNodeList("/PRPA_HIP1179/controlActProcess/subject/empiIndex/patientIds/patientId");
-            int nodeListLength = nodeList.getLength();
-            ArrayList<String> patientIds = new ArrayList<>();
-            if (nodeListLength > 0) {
-                for (int i = 0; i < nodeListLength; i++) {
-                    Node node = nodeList.item(i);
-                    String patientId = node.getTextContent();
-                    if (Func.isNotBlank(patientId)) {
-                        patientIds.add(patientId);
-                    }
-                }
-            }
-            return patientIds;
-        } catch (Exception ex) {
-            log.error("顺德人医解析患者交叉索引失败。", ex);
-            return new ArrayList<>();
-        }
-    }
 
 
     private void refreshTime(AfJobTime afJobTime) {

src/main/java/com/docus/server/report/listener/ReportDownListener.java

@@ -4,14 +4,13 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import com.docus.core.util.Func;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.api.ResultCode;
-import com.docus.server.report.config.ApplicationBusinessConfig;
+import com.docus.server.report.api.DownPlatformService;
-import com.docus.server.report.dto.ReportDownDto;
+import com.docus.server.report.api.dto.ReportDownDto;
-import com.docus.server.report.dto.ReportDownPatientDto;
+import com.docus.server.report.api.dto.ReportDownPatientDto;
-import com.docus.server.report.dto.ReportDownScanFileDto;
+import com.docus.server.report.api.dto.ReportDownScanFileDto;
-import com.docus.server.report.dto.ReportDto;
+import com.docus.server.report.api.dto.ReportDto;
 import com.docus.server.report.entity.AfReportRecord;
 import com.docus.server.report.event.TaskConsumptionReportDownEvent;
 import com.docus.server.report.event.ThreePartyPushReportDownEvent;
@@ -29,8 +28,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * 上报下载监听
@@ -41,7 +38,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @Slf4j
 public class ReportDownListener {
     @Resource
-    private ApplicationBusinessConfig applicationBusinessConfig;
+    private DownPlatformService downPlatformService;
 
     @Resource
     private AfReportRecordMapper afReportRecordMapper;
@@ -70,20 +67,11 @@ public class ReportDownListener {
         reportDownDto.setScanfiles(reportDownScanFileDtos);
 
         // 下面是调用下载服务
-
+        CommonResult result = downPlatformService.report(reportDownDto);
-        String requestParam = Func.toJson(reportDownDto);
+        if (ResultCode.SUCCESS.getCode().equals(result.getCode())) {
-        try {
-            log.info("调用下载服务，地址：{} ，参数：{}",applicationBusinessConfig.getDownUrl(),requestParam);
-            String respBody = post(applicationBusinessConfig.getDownUrl(),requestParam);
-            log.info("调用下载服务成功,响应参数：{}", respBody);
-            CommonResult commonResult = Func.readJson(respBody, CommonResult.class);
-            if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())) {
             // 下载返回了成功更新状态
             afReportRecordMapper.updateStateByTaskId(threePartyPushReportDownEvent.getTaskId());
         }
-        } catch (Exception e) {
-            log.error("调用下载服务失败", e);
-        }
     }
 
 
@@ -110,30 +98,10 @@ public class ReportDownListener {
         reportDownDto.setScanfiles(reportDownScanFileDtos);
 
         // 下面是调用下载服务
-        String requestParam = Func.toJson(reportDownDto);
+        downPlatformService.report(reportDownDto);
-        try {
-            log.info("调用下载服务，地址：{} ，参数：{}",applicationBusinessConfig.getDownUrl(),requestParam);
-            String respBody = post(applicationBusinessConfig.getDownUrl(),requestParam);
-            log.info("调用下载服务成功,响应参数：{}", respBody);
-        } catch (Exception e) {
-            log.error("调用下载服务失败", e);
-        }
     }
 
-    private final static Lock HTTP_POST_LOCK=new ReentrantLock();
+
-    public String post(String url,String body){
-        HTTP_POST_LOCK.lock();
-        try {
-            HttpRequest post = HttpUtil.createPost(url);
-            post.timeout(5 * 1000);
-            post.header("Content-Type", "application/json; charset=utf-8");
-            post.body(body);
-            HttpResponse response = post.execute();
-            return  response.body();
-        }finally {
-            HTTP_POST_LOCK.unlock();
-        }
-    }
 
     public static void main(String[] args) throws IOException {
         BASE64Encoder encoder = new BASE64Encoder();

src/main/java/com/docus/server/report/service/ReportService.java

@@ -1,6 +1,6 @@
 package com.docus.server.report.service;
 
-import com.docus.server.report.dto.ReportDto;
+import com.docus.server.report.api.dto.ReportDto;
 
 import java.util.List;
 

src/main/java/com/docus/server/report/service/impl/ReportServiceImpl.java

@@ -3,7 +3,7 @@ package com.docus.server.report.service.impl;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collection.mapper.TBasicMapper;
-import com.docus.server.report.dto.ReportDto;
+import com.docus.server.report.api.dto.ReportDto;
 import com.docus.server.report.entity.AfCollectTask;
 import com.docus.server.report.entity.AfReportRecord;
 import com.docus.server.report.event.TaskConsumptionReportDownEvent;

src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.core.exception.BaseException;
-import com.docus.server.report.dto.ReportDto;
+import com.docus.server.report.api.dto.ReportDto;
 import com.docus.server.report.service.ReportService;
 import com.docus.server.report.util.IdUtil;
 import com.docus.server.report.util.JSXMLResult;