From 973a15a5263af62480a9748c2e636eee4408cf5c Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Mon, 23 Oct 2023 15:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8D=95=E5=8F=B7=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/server/common/entity/SdryPacsPrintExcept.java  | 5 +++++
 src/main/java/com/docus/server/report/api/dto/ReportDto.java | 2 ++
 .../java/com/docus/server/report/job/FetchPacsBase64Job.java | 2 ++
 src/main/resources/mapper/SdryPacsPrintExceptMapper.xml      | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/docus/server/common/entity/SdryPacsPrintExcept.java b/src/main/java/com/docus/server/common/entity/SdryPacsPrintExcept.java
index 9f97f7c..e59e0b3 100644
--- a/src/main/java/com/docus/server/common/entity/SdryPacsPrintExcept.java
+++ b/src/main/java/com/docus/server/common/entity/SdryPacsPrintExcept.java
@@ -48,6 +48,11 @@ public class SdryPacsPrintExcept implements Serializable {
     */
     private Date createTime;
 
+    /**
+     * 检查报告单号
+     */
+
+    private String examReportSn;
 
     /**
      *  推送的标识 区分新增1008和更新1009
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 708f3e4..485f5bc 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
@@ -84,6 +84,8 @@ public class ReportDto {
      */
     private String reportSn;
 
+
+
     public ReportDto() {
     }
 
diff --git a/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java b/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java
index d7a8d88..14d3e90 100644
--- a/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java
+++ b/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java
@@ -100,6 +100,7 @@ public class FetchPacsBase64Job {
         pacsPrintExcept.setServiceFlag(WebserviceMessageType.HIP1008);
         pacsPrintExcept.setState(0);
         pacsPrintExcept.setCreateTime(new Date());
+        pacsPrintExcept.setExamReportSn(reportDto2.getReportSn());
         sdryPacsPrintExceptService.insert(pacsPrintExcept);
     }
 
@@ -126,6 +127,7 @@ public class FetchPacsBase64Job {
         pacsPrintExcept.setReportMessagePath(filePath);
         pacsPrintExcept.setServiceFlag(WebserviceMessageType.HIP1009);
         pacsPrintExcept.setState(0);
+        pacsPrintExcept.setExamReportSn(reportDto2.getReportSn());
         pacsPrintExcept.setCreateTime(new Date());
         sdryPacsPrintExceptService.insert(pacsPrintExcept);
     }
diff --git a/src/main/resources/mapper/SdryPacsPrintExceptMapper.xml b/src/main/resources/mapper/SdryPacsPrintExceptMapper.xml
index cd60893..7411c81 100644
--- a/src/main/resources/mapper/SdryPacsPrintExceptMapper.xml
+++ b/src/main/resources/mapper/SdryPacsPrintExceptMapper.xml
@@ -6,8 +6,8 @@
 
 
     <insert id="saveExcept">
-        INSERT INTO `docus_archivefile`.`sdry_pacs_print_except`(`id`, `inpatient_no`, `admiss_times`, `jzh`, `report_message_path`, `state`, `create_time`, `service_flag`)
-        VALUES (#{except.id}, #{except.inpatientNo}, #{except.admissTimes}, #{except.jzh}, #{except.reportMessagePath}, 0, #{except.createTime}, #{except.serviceFlag})
+        INSERT INTO `docus_archivefile`.`sdry_pacs_print_except`(`id`, `inpatient_no`, `admiss_times`, `jzh`, `report_message_path`, `state`, `create_time`, `service_flag`,`exam_report_sn`)
+        VALUES (#{except.id}, #{except.inpatientNo}, #{except.admissTimes}, #{except.jzh}, #{except.reportMessagePath}, 0, #{except.createTime}, #{except.serviceFlag},#{except.examReportSn})
     </insert>
     <update id="compensateSuccuss">
         update