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 1c53a83ed9..9c9dcb6965 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 @@ -97,7 +97,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE 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) @@ -172,7 +184,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE 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 a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0