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,