From 780f5240362d7139c29d4cae38dae933f1a05b6a Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Thu, 8 Jun 2023 10:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=A5=E5=91=8A=E5=92=8Cpd?=
 =?UTF-8?q?f=E4=B8=8A=E4=BC=A0=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D-pass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-config/js-table-type.json                             | 1 +
 data-config/sdry-report-system.json                        | 2 +-
 .../docus/server/collection/webservice/ReceiveServer.java  | 7 ++++++-
 .../collection/webservice/impl/ReceiveServerImpl.java      | 4 ++++
 .../java/com/docus/server/report/api/dto/ReportDto.java    | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/data-config/js-table-type.json b/data-config/js-table-type.json
index 34b4908..3402c14 100644
--- a/data-config/js-table-type.json
+++ b/data-config/js-table-type.json
@@ -5,5 +5,6 @@
   "BL-001": "病理文件分段id",
   "CS-001": "超声文件分段id",
   "petct": "petct文件分段id",
+  "xdxt": "xdxt文件分段id",
   "other": "其他文件分段id"
 }
\ No newline at end of file
diff --git a/data-config/sdry-report-system.json b/data-config/sdry-report-system.json
index e5b5781..e080057 100644
--- a/data-config/sdry-report-system.json
+++ b/data-config/sdry-report-system.json
@@ -1,4 +1,4 @@
 {
-  "blocking": ["cs","yx","jc"],
+  "blocking": ["xdxt","yx","jc"],
   "notHandled":["lis","bl","nh"]
 }
\ No newline at end of file
diff --git a/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java b/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
index c7121c7..7ef5638 100644
--- a/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
+++ b/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
@@ -42,7 +42,12 @@ public interface ReceiveServer {
       * @return 返回信息
       */
      public String pushExaminationReport(String examinationReportMessage);
-
+     /**
+      * HIP1166-pdf件上传服务 顺德人医 ，和检查报告配合
+      * @param uploadMessage pdf上传信息
+      * @return 成功或者异常信息
+      */
+      String pdfUpload(String uploadMessage);
      /**
       * 接收检查报告的信息 - 新增
       *
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
index 486b833..c16966f 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
@@ -63,6 +63,10 @@ public class ReceiveServerImpl implements ReceiveServer {
     public String pushExaminationReport(String examinationReportMessage) {
         return reportServer.pushExaminationReport(examinationReportMessage);
     }
+    @Override
+    public String pdfUpload(String uploadMessage) {
+        return reportServer.pdfUpload(uploadMessage);
+    }
 
     @Override
     public String pushAddInspectionReport(String inspectionReportMessage) {
diff --git a/src/main/java/com/docus/server/report/api/dto/ReportDto.java b/src/main/java/com/docus/server/report/api/dto/ReportDto.java
index bf26e50..c10af6e 100644
--- a/src/main/java/com/docus/server/report/api/dto/ReportDto.java
+++ b/src/main/java/com/docus/server/report/api/dto/ReportDto.java
@@ -86,6 +86,8 @@ public class ReportDto {
         this.fileSource = "1";
         this.filestoragetype = "1";
         this.downtype = buffer.getDownType();
+        this.downUrl = buffer.getDownUrl();
+        this.sysFlag = buffer.getSysflag();
         this.reportSn = buffer.getReportSn();
     }
 }