From 802a723bef0225e03dbdb0db4fbe92955119cf13 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 19 Sep 2022 17:07:07 +0800
Subject: [PATCH] bug

---
 .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java  | 1 +
 .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 677a5760ba..1c8f9fab4e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -326,6 +326,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         e.setMobile(formDTO.getMobile());
         e.setReason(formDTO.getReason());
         e.setRemark(formDTO.getRemark());
+        e.setIsolatedState(formDTO.getIsolatedState());
         update(e,w);
         if (CollectionUtils.isNotEmpty(formDTO.getChannel())){
             SendNoticeFormDTO dto = new SendNoticeFormDTO();
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 d6d129d6a4..8a0e29a55f 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
@@ -98,13 +98,14 @@
         b.HOME_ID,
         b.id as userId,
         a.ISOLATED_STATE,
-        IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime        FROM ic_epidemic_special_attention a
+        IFNULL((SELECT DATE_FORMAT(NAT_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_nat WHERE DEL_FLAG = '0' AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastNatTime
+        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
         AND concat(a.pids,':',ORG_ID) like concat('%',#{orgId},'%')
         AND a.ATTENTION_TYPE = #{attentionType}
         <if test='null != isolatedState and "" != isolatedState'>
-            AND a.isolatedState = #{isolatedState}
+            AND a.isolated_state = #{isolatedState}
         </if>
         <if test='null != isHistory and "" != isHistory'>
             AND a.is_history = 1