From 7cf0214500958e0eb20e51a5184108cf93716369 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 19 Sep 2022 18:05:47 +0800
Subject: [PATCH] a

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

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 d621eb4f92..9dc1f79e72 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
@@ -162,6 +162,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                 result.setTotal(list.size());
             }
         }else if (formDTO.getAttentionType().equals(NumConstant.TWO)){
+            formDTO.setIsHistory(NumConstant.ZERO_STR);
             if (formDTO.getIsPage()){
                 PageInfo<VaccinationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.natList(formDTO));
                 result.setList(pageInfo.getList());
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 c475e9cfbe..abcabebdba 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
@@ -108,7 +108,10 @@
         <if test='null != isolatedState and "" != isolatedState'>
             AND a.isolated_state = #{isolatedState}
         </if>
-        <if test='null != isHistory and "" != isHistory'>
+        <if test='null != isHistory and "" != isHistory and isHistory == "0"'>
+            AND a.IS_ATTENTION = 1
+        </if>
+        <if test='null != isHistory and "" != isHistory and isHistory == "1"'>
             AND a.is_history = 1
         </if>
         <if test='null != name and "" != name'>