diff --git a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java
index 3983576..eccb467 100644
--- a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java
+++ b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java
@@ -902,10 +902,11 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
             }
         }
         List<PopulationInfoDTO> listList = populationInfoDao.list(params);
-        ArrayList<String> arr = new ArrayList();
+        LinkedHashSet<String> arr1 = new LinkedHashSet<>();
         for(PopulationInfoDTO dto : listList) {
-            arr.add(dto.getCreator());
+            arr1.add(dto.getCreator());
         }
+        ArrayList<String> arr = new ArrayList<>(arr1);
         // 查询创建人用户集
         List<UserResourceBO> jsonArray = iUserService.listUserResourceByIds(arr);
         UserResourceBO bo1 = new UserResourceBO();
@@ -940,18 +941,39 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
     public SuccessResultList<List<PopulationInfoDTO>> listSystem(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
         Map<String, Object> params = page.getParams();
+        List<String> tabLevelList = new ArrayList<>();
         if(params.get("tabLevel") != null) {
             Object obj = params.get("tabLevel");
             if (obj instanceof String) {
                 List<String> list = Arrays.asList(params.get("tabLevel").toString().split(","));
-                params.put("tabLevelIds", list);
+                tabLevelList.addAll(list);
+
             }
         }
-        List<PopulationInfoDTO> listList = populationInfoDao.listSystem(params);
-        ArrayList<String> arr = new ArrayList();
-        for(PopulationInfoDTO dto : listList) {
-            arr.add(dto.getCreator());
+        if(params.get("tabLevelGroup") != null) {
+            Object obj = params.get("tabLevelGroup");
+            if (obj instanceof String) {
+                List<String> groupList = Arrays.asList(params.get("tabLevelGroup").toString().split(","));
+                List<DataDictionaryDTO> list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21");
+                a:for(DataDictionaryDTO dto : list) {
+                    if (groupList.contains(dto.getDictionarySummary())) {
+                        for(String s : tabLevelList) {
+                            if (dto.getDictionaryId().equals(s)) {
+                                continue a;
+                            }
+                        }
+                        tabLevelList.add(dto.getDictionaryId());
+                    }
+                }
+            }
         }
+        params.put("tabLevelIds", tabLevelList);
+        List<PopulationInfoDTO> listList = populationInfoDao.listSystem(params);
+        LinkedHashSet<String> arr1 = new LinkedHashSet<>();
+        for(PopulationInfoDTO dto : listList) {
+            arr1.add(dto.getCreator());
+        }
+        ArrayList<String> arr = new ArrayList<>(arr1);
         // 查询创建人用户集(用于认领页面的显示)
         List<UserResourceBO> jsonArray = iUserService.listUserResourceByIds(arr);
         UserResourceBO bo1 = new UserResourceBO();
@@ -995,7 +1017,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
 
     @Override
     public SuccessResultList<List<PopulationInfoDTO>> listPage(ListPage page) {
-        PageHelper.startPage(page.getPage(), page.getRows());
         Map<String, Object> params = page.getParams();
         if(params.get("populationInfoIds") != null) {
             Object obj = params.get("populationInfoIds");
@@ -1007,18 +1028,40 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
                 params.put("populationInfoIds", list);
             }
         }
+        List<String> tabLevelList = new ArrayList<>();
         if(params.get("tabLevel") != null) {
             Object obj = params.get("tabLevel");
             if (obj instanceof String) {
                 List<String> list = Arrays.asList(params.get("tabLevel").toString().split(","));
-                params.put("tabLevelIds", list);
+                tabLevelList.addAll(list);
+
             }
         }
-        List<PopulationInfoDTO> listList = populationInfoDao.listPage(params);
-        ArrayList<String> arr = new ArrayList();
-        for(PopulationInfoDTO dto : listList) {
-            arr.add(dto.getCreator());
+        if(params.get("tabLevelGroup") != null) {
+            Object obj = params.get("tabLevelGroup");
+            if (obj instanceof String) {
+                List<String> groupList = Arrays.asList(params.get("tabLevelGroup").toString().split(","));
+                List<DataDictionaryDTO> list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21");
+                a:for(DataDictionaryDTO dto : list) {
+                    if (groupList.contains(dto.getDictionarySummary())) {
+                        for(String s : tabLevelList) {
+                            if (dto.getDictionaryId().equals(s)) {
+                                continue a;
+                            }
+                        }
+                        tabLevelList.add(dto.getDictionaryId());
+                    }
+                }
+            }
         }
+        params.put("tabLevelIds", tabLevelList);
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<PopulationInfoDTO> listList = populationInfoDao.listPage(params);
+        LinkedHashSet<String> arr1 = new LinkedHashSet<>();
+        for(PopulationInfoDTO dto : listList) {
+            arr1.add(dto.getCreator());
+        }
+        ArrayList<String> arr = new ArrayList<>(arr1);
         // 查询创建人用户集(用于认领页面的显示)
         List<UserResourceBO> jsonArray = iUserService.listUserResourceByIds(arr);
         UserResourceBO bo1 = new UserResourceBO();
@@ -1064,13 +1107,33 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
                 params.put("populationInfoIds", list);
             }
         }
+        List<String> tabLevelList = new ArrayList<>();
         if(params.get("tabLevel") != null) {
             Object obj = params.get("tabLevel");
             if (obj instanceof String) {
                 List<String> list = Arrays.asList(params.get("tabLevel").toString().split(","));
-                params.put("tabLevelIds", list);
+                tabLevelList.addAll(list);
+
             }
         }
+        if(params.get("tabLevelGroup") != null) {
+            Object obj = params.get("tabLevelGroup");
+            if (obj instanceof String) {
+                List<String> groupList = Arrays.asList(params.get("tabLevelGroup").toString().split(","));
+                List<DataDictionaryDTO> list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21");
+                a:for(DataDictionaryDTO dto : list) {
+                    if (groupList.contains(dto.getDictionarySummary())) {
+                        for(String s : tabLevelList) {
+                            if (dto.getDictionaryId().equals(s)) {
+                                continue a;
+                            }
+                        }
+                        tabLevelList.add(dto.getDictionaryId());
+                    }
+                }
+            }
+        }
+        params.put("tabLevelIds", tabLevelList);
         List<PopulationInfoDTO> listList = populationInfoDao.list(params);
         PageInfo<PopulationInfoDTO> pageInfo = new PageInfo<>(listList);
         return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal());
@@ -1091,13 +1154,33 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
 
     @Override
     public List<PopulationInfoPieDTO> countSystem(Map<String, Object> params) {
+        List<String> tabLevelList = new ArrayList<>();
         if(params.get("tabLevel") != null) {
             Object obj = params.get("tabLevel");
             if (obj instanceof String) {
                 List<String> list = Arrays.asList(params.get("tabLevel").toString().split(","));
-                params.put("tabLevelIds", list);
+                tabLevelList.addAll(list);
+
             }
         }
+        if(params.get("tabLevelGroup") != null) {
+            Object obj = params.get("tabLevelGroup");
+            if (obj instanceof String) {
+                List<String> groupList = Arrays.asList(params.get("tabLevelGroup").toString().split(","));
+                List<DataDictionaryDTO> list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21");
+                a:for(DataDictionaryDTO dto : list) {
+                    if (groupList.contains(dto.getDictionarySummary())) {
+                        for(String s : tabLevelList) {
+                            if (dto.getDictionaryId().equals(s)) {
+                                continue a;
+                            }
+                        }
+                        tabLevelList.add(dto.getDictionaryId());
+                    }
+                }
+            }
+        }
+        params.put("tabLevelIds", tabLevelList);
         List<PopulationInfoPieDTO> list = populationInfoDao.countSystem(params);
         return list;
     }
diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
index 33f9863..4b31c1f 100644
--- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
+++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
@@ -1241,10 +1241,13 @@
                 AND ( t1.organization != '中国共产党党员' AND t1.organization != '中国共产主义青年团团员' AND t1.organization != '中国共产党预备党员')
             </if>
             <if test="type != null and type != '' and type == '常住人口'">
-                AND (t1.flow_time = '' OR t1.flow_time IS NULL)
+                AND t1.domicile_address_type != '3' AND (t1.flow_time IS NOT NULL AND t1.flow_time != '' OR  6 > DATE_ADD(CURDATE(), INTERVAL 6 MONTH) )
             </if>
             <if test="type != null and type != '' and type == '流动人口'">
-                AND t1.flow_time != '' AND t1.flow_time IS NOT NULL
+                AND t1.domicile_address_type != '3' AND (t1.flow_time IS NULL OR t1.flow_time = '' OR t1.flow_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH) )
+            </if>
+            <if test="type != null and type != '' and type == '户籍人口'">
+                AND t1.domicile_address_type = '3'
             </if>
             <if test="religion != null and religion != ''">
                 AND t1.religion = #{religion}
@@ -1353,6 +1356,15 @@
                 t1.label LIKE CONCAT('%', #{tabLevelIds[${index}]}, '%')
             </foreach>
         </if>
+        <if test="type != null and type != '' and type == '常住人口'">
+            AND t1.domicile_address_type != '3' AND (t1.flow_time IS NOT NULL AND t1.flow_time != '' OR  6 > DATE_ADD(CURDATE(), INTERVAL 6 MONTH) )
+        </if>
+        <if test="type != null and type != '' and type == '流动人口'">
+            AND t1.domicile_address_type != '3' AND (t1.flow_time IS NULL OR t1.flow_time = '' OR t1.flow_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH) )
+        </if>
+        <if test="type != null and type != '' and type == '户籍人口'">
+            AND t1.domicile_address_type = '3'
+        </if>
         <if test="creator != null and creator != ''">
             AND t1.creator = #{creator}
         </if>
@@ -1487,6 +1499,15 @@
                     t1.label LIKE CONCAT('%', #{tabLevelIds[${index}]}, '%')
                 </foreach>
             </if>
+            <if test="type != null and type != '' and type == '常住人口'">
+                AND t1.domicile_address_type != '3' AND (t1.flow_time IS NOT NULL AND t1.flow_time != '' OR  6 > DATE_ADD(CURDATE(), INTERVAL 6 MONTH) )
+            </if>
+            <if test="type != null and type != '' and type == '流动人口'">
+                AND t1.domicile_address_type != '3' AND (t1.flow_time IS NULL OR t1.flow_time = '' OR t1.flow_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH) )
+            </if>
+            <if test="type != null and type != '' and type == '户籍人口'">
+                AND t1.domicile_address_type = '3'
+            </if>
             <if test="(residentialId != null and residentialId != '') or (buildingId != null and buildingId != '') or (houseId != null and houseId != '')">
                 <if test="residentialId != null and residentialId != ''"><!-- 小区 -->
                     AND hh.residential_id = #{residentialId}
diff --git a/src/main/resources/templates/populationinfo/list-bigdata.html b/src/main/resources/templates/populationinfo/list-bigdata.html
index a023334..7382eed 100644
--- a/src/main/resources/templates/populationinfo/list-bigdata.html
+++ b/src/main/resources/templates/populationinfo/list-bigdata.html
@@ -37,6 +37,21 @@
         .tabLevel5 > .layui-form-checkbox span {
             background-color: #08F422;
         }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(1) span {
+            background-color: #db4343;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(2) span {
+            background-color: #F48208;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(3) span {
+            background-color: #F4CF08;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(4) span {
+            background-color: #08A7F4;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(5) span {
+            background-color: #08F422;
+        }
         .layui-form-checkbox {
             line-height: 20px !important;
             padding-right: 20px !important;
@@ -138,6 +153,14 @@
                         <div class="layui-inline">
                             <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
                         </div>
+                        <div class="layui-inline layui-form search-item" >
+                            <select id="type" name="type">
+                                <option value="">请选择人员类型</option>
+                                <option value="户籍人口">户籍人口</option>
+                                <option value="常住人口">常住人口</option>
+                                <option value="流动人口">流动人口</option>
+                            </select>
+                        </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -145,6 +168,13 @@
                             <i class="fa fa-lg fa-close"></i> 清空条件
                         </button>
                     </div>
+                    <div class="layui-input-block layui-form tabLevelGroup" style="margin-left: 0px;margin-top: -2px;min-height: 24px;">
+                        <input type="checkbox" name="tabLevelGroup" value="#db4343" title="特别关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F48208" title="及时关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F4CF08" title="一般关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08A7F4" title="重点关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08F422" title="日常关注">
+                    </div>
                     <div class="layui-form-item" id="labelSelectTemplateBox"  lay-filter="labelSelectTemplateBox"></div>
                     <script id="labelSelectTemplate" type="text/html">
                         {{# var tabLevel1 = 0;  var tabLevel2 = 0; var tabLevel3 = 0; var tabLevel4 = 0; var tabLevel5 = 0; }}
@@ -278,6 +308,17 @@
             });
         }
 
+        function getTabLevelGroup() {
+            var values = new Array();
+            $('input[name="tabLevelGroup"]:checked').each(function() {
+                values.push($(this).val()); // 将选中的值添加到数组中
+            });
+            if (values.length < 1) {
+                return "";
+            }
+            return values.join(",");
+        }
+
         function getTabLevel() {
             var values = new Array();
             $('input[name="tabLevel1"]:checked').each(function() {
@@ -625,8 +666,11 @@
 
         function getParams() {
             var tabLevel = getTabLevel();
+            var tabLevelGroup = getTabLevelGroup();
             var dataParams = {
                 tabLevel: tabLevel,
+                tabLevelGroup: tabLevelGroup,
+                type: $("#type").val(),
                 name: $('#name').val(),
                 idcardType: $('#idcardType').val(),
                 idcard: $('#idcard').val(),
diff --git a/src/main/resources/templates/populationinfo/list-creator.html b/src/main/resources/templates/populationinfo/list-creator.html
index 4be356b..62cca35 100644
--- a/src/main/resources/templates/populationinfo/list-creator.html
+++ b/src/main/resources/templates/populationinfo/list-creator.html
@@ -37,6 +37,21 @@
         .tabLevel5 > .layui-form-checkbox span {
             background-color: #08F422;
         }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(1) span {
+            background-color: #db4343;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(2) span {
+            background-color: #F48208;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(3) span {
+            background-color: #F4CF08;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(4) span {
+            background-color: #08A7F4;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(5) span {
+            background-color: #08F422;
+        }
         .layui-form-checkbox {
             line-height: 20px !important;
             padding-right: 20px !important;
@@ -138,10 +153,25 @@
                         <div class="layui-inline">
                             <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
                         </div>
+                        <div class="layui-inline layui-form search-item" >
+                            <select id="type" name="type">
+                                <option value="">请选择人员类型</option>
+                                <option value="户籍人口">户籍人口</option>
+                                <option value="常住人口">常住人口</option>
+                                <option value="流动人口">流动人口</option>
+                            </select>
+                        </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
                     </div>
+                    <div class="layui-input-block layui-form tabLevelGroup" style="margin-left: 0px;margin-top: -2px;min-height: 24px;">
+                        <input type="checkbox" name="tabLevelGroup" value="#db4343" title="特别关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F48208" title="及时关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F4CF08" title="一般关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08A7F4" title="重点关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08F422" title="日常关注">
+                    </div>
                     <div class="layui-form-item" id="labelSelectTemplateBox"  lay-filter="labelSelectTemplateBox"></div>
                     <script id="labelSelectTemplate" type="text/html">
                         {{# var tabLevel1 = 0;  var tabLevel2 = 0; var tabLevel3 = 0; var tabLevel4 = 0; var tabLevel5 = 0; }}
@@ -299,6 +329,17 @@
             });
         }
 
+        function getTabLevelGroup() {
+            var values = new Array();
+            $('input[name="tabLevelGroup"]:checked').each(function() {
+                values.push($(this).val()); // 将选中的值添加到数组中
+            });
+            if (values.length < 1) {
+                return "";
+            }
+            return values.join(",");
+        }
+
         function getTabLevel() {
             var values = new Array();
             $('input[name="tabLevel1"]:checked').each(function() {
@@ -599,10 +640,13 @@
 
         function getParams() {
             var tabLevel = getTabLevel();
+            var tabLevelGroup = getTabLevelGroup();
             var dataParams = {
                 name: $('#name').val(),
                 tabLevel: tabLevel,
+                tabLevelGroup: tabLevelGroup,
                 idcardType: $('#idcardType').val(),
+                type: $("#type").val(),
                 idcard: $('#idcard').val(),
                 creatorArea1: "",
                 creatorArea2: "",
diff --git a/src/main/resources/templates/populationinfo/list.html b/src/main/resources/templates/populationinfo/list.html
index 32da622..944be91 100644
--- a/src/main/resources/templates/populationinfo/list.html
+++ b/src/main/resources/templates/populationinfo/list.html
@@ -37,6 +37,21 @@
         .tabLevel5 > .layui-form-checkbox span {
             background-color: #08F422;
         }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(1) span {
+            background-color: #db4343;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(2) span {
+            background-color: #F48208;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(3) span {
+            background-color: #F4CF08;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(4) span {
+            background-color: #08A7F4;
+        }
+        .tabLevelGroup > .layui-form-checkbox:nth-of-type(5) span {
+            background-color: #08F422;
+        }
         .layui-form-checkbox {
             line-height: 20px !important;
             padding-right: 20px !important;
@@ -135,6 +150,14 @@
                             <input type="text" id="name" class="layui-input search-item" placeholder="请输入姓名">
                         </div>
                         <div class="layui-inline layui-form search-item" id="idcardTypeSelectTemplateBox" lay-filter="idcardTypeSelectTemplateBox"></div>
+                        <div class="layui-inline layui-form search-item" >
+                            <select id="type" name="type">
+                                <option value="">请选择人员类型</option>
+                                <option value="户籍人口">户籍人口</option>
+                                <option value="常住人口">常住人口</option>
+                                <option value="流动人口">流动人口</option>
+                            </select>
+                        </div>
                         <div class="layui-inline">
                             <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
                         </div>
@@ -142,6 +165,13 @@
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
                     </div>
+                    <div class="layui-input-block layui-form tabLevelGroup" style="margin-left: 0px;margin-top: -2px;min-height: 24px;">
+                        <input type="checkbox" name="tabLevelGroup" value="#db4343" title="特别关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F48208" title="及时关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#F4CF08" title="一般关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08A7F4" title="重点关注">
+                        <input type="checkbox" name="tabLevelGroup" value="#08F422" title="日常关注">
+                    </div>
                     <div class="layui-form-item" id="labelSelectTemplateBox"  lay-filter="labelSelectTemplateBox"></div>
                     <script id="labelSelectTemplate" type="text/html">
                         {{# var tabLevel1 = 0;  var tabLevel2 = 0; var tabLevel3 = 0; var tabLevel4 = 0; var tabLevel5 = 0; }}
@@ -297,6 +327,17 @@
             });
         }
 
+        function getTabLevelGroup() {
+            var values = new Array();
+            $('input[name="tabLevelGroup"]:checked').each(function() {
+                values.push($(this).val()); // 将选中的值添加到数组中
+            });
+            if (values.length < 1) {
+                return "";
+            }
+            return values.join(",");
+        }
+
         function getTabLevel() {
             var values = new Array();
             $('input[name="tabLevel1"]:checked').each(function() {
@@ -609,8 +650,11 @@
 
         function getParams() {
             var tabLevel = getTabLevel();
+            var tabLevelGroup = getTabLevelGroup();
             var dataParams = {
                 tabLevel: tabLevel,
+                tabLevelGroup: tabLevelGroup,
+                type: $("#type").val(),
                 name: $('#name').val(),
                 idcardType: $('#idcardType').val(),
                 idcard: $('#idcard').val(),
diff --git a/src/main/resources/templates/populationinfo/save.html b/src/main/resources/templates/populationinfo/save.html
index 07feb3e..6e0167a 100644
--- a/src/main/resources/templates/populationinfo/save.html
+++ b/src/main/resources/templates/populationinfo/save.html
@@ -1578,6 +1578,7 @@
         // 提交表单
         form.on('submit(submitTempForm)', function(formData) {
             try{
+                formData.field['label'] = top.restAjax.checkBoxToString(formData.field, 'label');
                 window.localStorage.setItem("tempSavePopulation", JSON.stringify(formData.field));
                 layer.msg("暂存内容已更新");
             }catch(err){