From eaf7f0b9d1359c944454cad06eec3a0d268dad5e Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 16 Nov 2022 13:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E8=AE=B0=E5=BD=95=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E2=80=9C=E8=AF=95=E7=AE=A1=E7=BC=96=E5=8F=B7=E2=80=9D=20?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BA=A7=E8=9B=8B4679?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcNatDTO.java |   5 +++++
 .../com/epmet/dto/form/AddIcNatFormDTO.java   |   4 ++++
 .../epmet/dto/result/MyNatListResultDTO.java  |   5 +++++
 .../epmet/dto/result/NatListResultDTO.java    |  13 ++++++++++---
 .../java/com/epmet/entity/IcNatEntity.java    |   5 +++++
 .../excel/data/IcNatImportExcelData.java      |   3 +++
 .../db/migration/V0.0.89_alter_ic_nat.sql     |   4 ++++
 .../src/main/resources/excel/ic_nat.xlsx      | Bin 9198 -> 9824 bytes
 .../src/main/resources/mapper/IcNatDao.xml    |  12 ++++++++----
 9 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
index 1e8da051b1..de5e70080b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
@@ -107,6 +107,11 @@ public class IcNatDTO implements Serializable {
      */
     private String attachmentUrl;
 
+    /**
+     * 试管编号
+     */
+    private String testTubeCode;
+
     /**
      * 删除标识
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
index 1d7ba24673..b87f03d8d7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
@@ -89,6 +89,10 @@ public class AddIcNatFormDTO implements Serializable {
      * 附件地址
      */
     private String attachmentUrl;
+    /**
+     * 试管编号
+     */
+    private String testTubeCode;
     /**
      * 是否客户下居民(0:否  1:是)
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
index 355d52d213..59b0515e73 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
@@ -73,4 +73,9 @@ public class MyNatListResultDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date reportTime;
 
+    /**
+     * 试管编号
+     */
+    private String testTubeCode;
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java
index a93294b14f..bba32c13af 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java
@@ -73,14 +73,14 @@ public class NatListResultDTO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ColumnWidth(25)
-    @ExcelProperty(value = "采样时间",order = 4)
+    @ExcelProperty(value = "采样时间",order = 5)
     private Date sampleTime;
 
     /**
      * 检测结果
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "检测结果",order = 5)
+    @ExcelProperty(value = "检测结果",order = 7)
     private String natResult;
 
     /**
@@ -99,8 +99,15 @@ public class NatListResultDTO implements Serializable {
      * 检测地点
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "检测地点",order = 7)
+    @ExcelProperty(value = "检测地点",order = 6)
     private String natAddress;
 
+    /**
+     * 试管编号
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "试管编号",order = 8)
+    private String testTubeCode;
+
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
index 7cbe8cdd66..3246d9be0a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
@@ -94,6 +94,11 @@ public class IcNatEntity extends BaseEpmetEntity {
 	 */
 	private String attachmentUrl;
 
+	/**
+	 * 试管编号
+	 */
+	private String testTubeCode;
+
 	@TableField(exist = false)
 	private String agencyId;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java
index b54c571f8f..b5b52f8ea4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java
@@ -43,6 +43,9 @@ public class IcNatImportExcelData {
     @ExcelProperty("检测结果")
     private String natResultZh;
 
+    @ExcelProperty("试管编号")
+    private String testTubeCode;
+
     @Data
     public static class RowRemarkMessage {
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql
new file mode 100644
index 0000000000..7925891a55
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql
@@ -0,0 +1,4 @@
+--  核酸记录表增加非必填字段“试管编号” 对应产蛋4679
+ALTER TABLE `ic_nat`
+ADD COLUMN `TEST_TUBE_CODE`  varchar(255) NULL COMMENT '试管编号' AFTER `ATTACHMENT_URL`;
+
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
index 524d327bd7032cf01b51e60fcf15ec903428035d..de671285c675f9d081984301a95e52efe00ced57 100644
GIT binary patch
literal 9824
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

delta 7306
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
Hu6+IvcU3~$

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
index f6daee080d..243fbebcd7 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@@ -16,7 +16,8 @@
             nat_address natAddress,
             file_name fileName,
             attachment_url attachmentUrl,
-            created_time reportTime
+            created_time reportTime,
+            test_tube_code testTubeCode
         FROM
             ic_nat
         WHERE
@@ -45,7 +46,8 @@
             b.nat_time natTime,
             b.sample_time sampleTime,
             b.nat_result natResult,
-            b.nat_address natAddress
+            b.nat_address natAddress,
+            b.test_tube_code testTubeCode
         FROM
             ic_nat_relation a
         INNER JOIN ic_nat b ON a.IC_NAT_ID = b.ID
@@ -93,7 +95,8 @@
             nat_time natTime,
             sample_time sampleTime,
             nat_result natResult,
-            nat_address natAddress
+            nat_address natAddress,
+            test_tube_code testTubeCode
         FROM
             ic_nat
         WHERE
@@ -134,7 +137,8 @@
             nat_time,
             sample_time,
             nat_result,
-            nat_address
+            nat_address,
+            test_tube_code
         FROM
             ic_nat
         WHERE