From d9ca385b5f3743cc572b5f2e09351b0b88ff0c92 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 21 Sep 2022 13:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C=EF=BC=8CsendRes:?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C=EF=BC=9A1=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F,0=E5=A4=B1=E8=B4=A5=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/VaccinationListResultDTO.java   | 6 ++++++
 .../resources/db/migration/V0.0.71__icnotice_sendres.sql | 9 +++++++++
 .../resources/mapper/IcEpidemicSpecialAttentionDao.xml   | 2 ++
 3 files changed, 17 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
index 65c0eb51d9..55edbb1085 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
@@ -41,6 +41,12 @@ public class VaccinationListResultDTO implements Serializable {
      * 身份证
      */
     private String idCard;
+
+    /**
+     * 真实的身份证
+     */
+    private String realIdCard;
+
     private String sex;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql
index 5f767b5455..d15af15aa1 100644
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.71__icnotice_sendres.sql
@@ -1 +1,10 @@
 ALTER TABLE ic_notice ADD COLUMN SEND_RES VARCHAR ( 1 ) NOT NULL DEFAULT '1' COMMENT '发送结果：1成功,0失败' after ORG_NAME;
+update ic_notice n
+set n.SEND_RES='1'
+where n.USER_ID is not null
+  and n.USER_ID !='';
+
+update ic_notice n
+set n.SEND_RES='0'
+where (n.USER_ID is  null
+    or n.USER_ID ='');
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
index 2efa16eb77..a42d19bad9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@@ -71,6 +71,7 @@
             a.`NAME`,
             a.MOBILE,
             a.ID_CARD,
+            a.ID_CARD as realIdCard,
             IFNULL(a.reason,'') AS reason,
             a.REMARK,
             b.VILLAGE_ID,
@@ -124,6 +125,7 @@
         a.`NAME`,
         a.MOBILE,
         a.ID_CARD,
+        a.ID_CARD as realIdCard,
         a.REMARK,
         a.REASON,
         b.VILLAGE_ID,