diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index 5d880153a6..b2b8a7b95d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -95,7 +95,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { private String idCard; /** - * 原因 + * 关注原因；后磐石改名为隔离原因 */ @Length(max = 500,message = "原因限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String reason; @@ -106,6 +106,66 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { @Length(max = 500,message = "备注限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + /** * */ 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 7099e1650b..3faf74d3d3 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 @@ -127,6 +127,42 @@ public class VaccinationListResultDTO implements Serializable { @JsonIgnore private String customerId; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + private String gkTime; + + /** + * 镇（街）干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + private String gb; + + /** + * 村（社区）网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + private String gridManager; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + private String healthWorker; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + private String police; + + /** + * 志愿者+联系方式,需求来源于磐石 + */ + private String volunteer; + + public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; this.name = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java index a22f3f3537..aa4e6052fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java @@ -73,14 +73,74 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity { */ private String idCard; - /** - * 原因 - */ + /** + * 关注原因；后磐石改名为隔离原因 + */ private String reason; - /** - * 备注 - */ + /** + * 备注 + */ private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql new file mode 100644 index 0000000000..936a358868 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql @@ -0,0 +1,20 @@ +-- 禅道需求713 +alter table ic_epidemic_special_attention MODIFY COLUMN `reason` varchar(500) DEFAULT NULL comment '关注原因；后磐石改名为隔离原因'; +alter table ic_epidemic_special_attention MODIFY COLUMN `remark` varchar(500) DEFAULT NULL comment '备注'; + +alter table ic_epidemic_special_attention ADD column GK_START_TIME varchar(32) DEFAULT '' COMMENT '管控开始时间yyyy-MM-dd,需求来源于磐石' AFTER remark; +alter table ic_epidemic_special_attention ADD column GK_END_TIME varchar(32) DEFAULT '' COMMENT '管控结束时间yyyy-MM-dd,需求来源于磐石' AFTER GK_START_TIME; + +alter table ic_epidemic_special_attention ADD column GB_NAME VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部名称,需求来源于磐石' AFTER GK_END_TIME; +alter table ic_epidemic_special_attention ADD column GB_MOBILE VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部联系方式,需求来源于磐石' AFTER GB_NAME; + +alter table ic_epidemic_special_attention ADD column GRID_MANAGER VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员,需求来源于磐石' AFTER GB_MOBILE; +alter table ic_epidemic_special_attention ADD column GRID_MANAGER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员联系方式,需求来源于磐石' AFTER GRID_MANAGER; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者,需求来源于磐石' AFTER GRID_MANAGER_MOBILE; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者联系方式,需求来源于磐石' AFTER HEALTH_WORKER; + +alter table ic_epidemic_special_attention ADD column POLICE_NAME VARCHAR(32) DEFAULT '' COMMENT '民警,需求来源于磐石' AFTER HEALTH_WORKER_MOBILE; +alter table ic_epidemic_special_attention ADD column POLICE_MOBILE VARCHAR(32) DEFAULT '' COMMENT '民警联系方式,需求来源于磐石' AFTER POLICE_NAME; + +alter table ic_epidemic_special_attention ADD column VOLUNTEER_NAME VARCHAR(32) DEFAULT '' COMMENT '志愿者,需求来源于磐石' AFTER POLICE_MOBILE; +alter table ic_epidemic_special_attention ADD column VOLUNTEER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '志愿者联系方式,需求来源于磐石' AFTER VOLUNTEER_NAME; 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 5db13945cb..7f3c64b11f 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 @@ -81,7 +81,23 @@ b.UNIT_ID, b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, - IFNULL(v.vaccinationCount,0) AS vaccinationCount + IFNULL(v.vaccinationCount,0) AS vaccinationCount, + ( + case when a.GK_START_TIME is not null + and a.GK_START_TIME !='' + and a.GK_END_TIME is not null + and a.GK_END_TIME !='' + then concat(a.GK_START_TIME,'-',a.GK_END_TIME) + when a.GK_START_TIME is not null and (a.GK_END_TIME is null or a.GK_END_TIME='') then a.GK_START_TIME + when (a.GK_START_TIME is null or a.GK_START_TIME ='' ) and a.GK_END_TIME is not null and a.GK_END_TIME !='' then a.GK_END_TIME + else '' + end + )as gkTime, + concat(a.GB_NAME,a.GB_MOBILE) as gb, + concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManager, + concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorker, + concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as police, + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteer FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) @@ -125,22 +141,38 @@