From ca5bd3b1881498a7659c4236aeb2b82f48afba81 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 1 Nov 2022 18:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C=E7=A3=90?=
 =?UTF-8?q?=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B=E5=88=97?=
 =?UTF-8?q?=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcEpidemicSpecialAttentionDao.xml  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

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