diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
index 73928633fb..eb43d0ddd9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
@@ -92,6 +92,7 @@ public class AddIcNatFormDTO implements Serializable {
 
     //token中信息
     private String customerId;
+    private String staffId;
 
 
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java
index e9620dc5d2..157bc89a27 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java
@@ -14,8 +14,6 @@ import javax.validation.constraints.NotBlank;
 public class MyNatListFormDTO extends PageFormDTO {
     private static final long serialVersionUID = 9156247659994638103L;
 
-    public interface MyNat extends CustomerClientShowGroup {
-    }
     public interface Detail extends CustomerClientShowGroup {
     }
     public interface Del extends CustomerClientShowGroup {
@@ -26,7 +24,6 @@ public class MyNatListFormDTO extends PageFormDTO {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = MyNat.class)
     private String idCard;
     /**
      * 当前组织:current 根组织：all
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
index 7ed8b936e2..cbb43300fa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
@@ -72,7 +72,8 @@ public class IcEpidemicPreventionController{
      * @Date 2022/3/29 16:13
      */
     @PostMapping("detail")
-    public Result<EpidemicPreventionResultDTO> detail(@RequestBody EpidemicPreventionFormDTO formDTO) {
+    public Result<EpidemicPreventionResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         EpidemicPreventionResultDTO result = icResiUserService.getEpidemicPreventionDetail(formDTO);
         return new Result<EpidemicPreventionResultDTO>().ok(result);
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
index 95814147cb..1c82388e65 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
@@ -75,6 +75,7 @@ public class IcNatController implements ResultDataResolver {
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Nat.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         icNucleinService.add(formDTO);
         return new Result();
     }
@@ -86,8 +87,8 @@ public class IcNatController implements ResultDataResolver {
     @NoRepeatSubmit
     @PostMapping("mynatlist")
     public Result<List<MyNatListResultDTO>> myNatList(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.MyNat.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<List<MyNatListResultDTO>>().ok(icNucleinService.myNatList(formDTO));
     }
 
@@ -122,6 +123,7 @@ public class IcNatController implements ResultDataResolver {
     @PostMapping("edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         icNucleinService.edit(formDTO);
         return new Result();
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
index f6c83e9440..ebfb593947 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
@@ -70,7 +70,7 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
             icNatEntity.setAgencyId(currentAgencyId);
             icNatEntity.setPids(currentAgencyPids);
             icNatEntity.setUserId(currentUserId);
-            icNatEntity.setUserType("other");
+            icNatEntity.setUserType("import");
             icNatEntity.setNatResult(natResult);
             icNatEntity.setAttachmentType("");
             icNatEntity.setAttachmentUrl("");
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index dad0b433d5..e610c12fd3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -20,6 +20,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcNatDao;
+import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.*;
@@ -78,6 +79,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     @Autowired
     private OssFeignClient ossFeignClient;
 
+    @Autowired
+    private UserBaseInfoDao userBaseInfoDao;
+
     /**
      * @Author sun
      * @Description 核酸检测-上报核酸记录
@@ -105,7 +109,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             dto.setChannel(formDTO.getChannel());
             dto.setOrigin("2");
             dto.setContent(formDTO.getContent());
-            dto.setOrgName(agencyInfo.getOrganizationName());
+            dto.setStaffId(formDTO.getStaffId());
             icNoticeService.sendNotice(dto);
         }
 
@@ -117,7 +121,10 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      **/
     @Override
     public List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO) {
-        //1.根据身份证号查询该人员所有核酸记录(居民端录入、数字平台录入、数字平台导入)
+        //1.根据token信息查询居民身份证号
+        UserBaseInfoResultDTO dto = userBaseInfoDao.selectListByUserIdList(formDTO.getUserId());
+        formDTO.setIdCard(dto.getIdNum());
+        //2.查询当前人员创建的或该身份证号录入的核算检测数据(居民端录入、数字平台录入、数字平台导入)
         List<MyNatListResultDTO> resultList = baseDao.getMyNatList(formDTO);
         return resultList;
     }
@@ -186,12 +193,6 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
 
         //3.新增通知表信息
         if (CollectionUtils.isNotEmpty(formDTO.getChannel())) {
-            IcNatEntity icNatEntity = baseDao.selectById(formDTO.getIcNatId());
-            //1.获取所填居民所属组织缓存信息
-            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(icNatEntity.getAgencyId());
-            if (null == agencyInfo) {
-                throw new RenException(String.format("获取组织缓存信息失败%s", icNatEntity.getAgencyId()));
-            }
             SendNoticeFormDTO dto = new SendNoticeFormDTO();
             List<SendNoticeFormDTO.UserListBean> userList = new ArrayList<>();
             userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class));
@@ -200,7 +201,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             dto.setChannel(formDTO.getChannel());
             dto.setOrigin("2");
             dto.setContent(formDTO.getContent());
-            dto.setOrgName(agencyInfo.getOrganizationName());
+            dto.setStaffId(formDTO.getStaffId());
             icNoticeService.sendNotice(dto);
         }
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
index 9b3698798d..3a224d8540 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
@@ -5,14 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.ChannelEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.IcNoticeDao;
 import com.epmet.dto.IcNoticeDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.IcNoticeFormDTO;
 import com.epmet.dto.form.ProjectSendMsgFormDTO;
 import com.epmet.dto.form.SendNoticeFormDTO;
@@ -20,6 +23,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.IcNoticeEntity;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.service.IcNoticeService;
+import com.epmet.service.UserBaseInfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +48,8 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
 
     @Resource
     private MessageFeignClient messageFeignClient;
+    @Resource
+    private UserBaseInfoService userBaseInfoService;
 
     @Override
     public PageData<IcNoticeDTO> page(IcNoticeFormDTO formDTO) {
@@ -123,8 +129,14 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
      */
     @Override
     public void sendNotice(SendNoticeFormDTO formDTO) {
+        String orgName = "";
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null != staffInfo) {
+            orgName = staffInfo.getAgencyName();
+        }
         //保存消息
         String channel = StringUtils.join(formDTO.getChannel(), StrConstant.COMMA);
+        String finalOrgName = orgName;
         List<IcNoticeEntity> entityList = formDTO.getUserList().stream().map(item -> {
             IcNoticeEntity entity = new IcNoticeEntity();
             entity.setCustomerId(formDTO.getCustomerId());
@@ -134,7 +146,7 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             entity.setUserId(item.getUserId());
             entity.setMobile(item.getMobile());
             entity.setIdCard(item.getIdCard());
-            entity.setOrgName(formDTO.getOrgName());
+            entity.setOrgName(finalOrgName);
             return entity;
         }).collect(Collectors.toList());
         insertBatch(entityList);
@@ -145,18 +157,24 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
         List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
 
         entityList.forEach(item -> {
-            if (StringUtils.isNotBlank(item.getUserId())) {
-                UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
-                messageFormDTO.setCustomerId(item.getCustomerId());
-                messageFormDTO.setApp(AppClientConstant.APP_GOV);
-                messageFormDTO.setGridId(StrConstant.STAR);
-                messageFormDTO.setUserId(item.getUserId());
-                messageFormDTO.setTitle("您有一条通知消息！");
-                messageFormDTO.setMessageContent(item.getContent());
-                messageFormDTO.setReadFlag(Constant.UNREAD);
-                messageFormDTO.setMessageType(UserMessageTypeConstant.ANTIEPIDEMIC);
-                messageFormDTO.setTargetId(item.getId());
-                msgList.add(messageFormDTO);
+            if (StringUtils.isNotBlank(item.getIdCard())) {
+                //根据身份证获取居民ID
+                List<UserBaseInfoDTO> userList = userBaseInfoService.getCommonIdNumUser(item.getCustomerId(), item.getIdCard());
+                if (CollectionUtils.isNotEmpty(userList)) {
+                    userList.forEach(user -> {
+                        UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+                        messageFormDTO.setCustomerId(item.getCustomerId());
+                        messageFormDTO.setApp(AppClientConstant.APP_GOV);
+                        messageFormDTO.setGridId(StrConstant.STAR);
+                        messageFormDTO.setUserId(user.getUserId());
+                        messageFormDTO.setTitle("您有一条通知消息！");
+                        messageFormDTO.setMessageContent(item.getContent());
+                        messageFormDTO.setReadFlag(Constant.UNREAD);
+                        messageFormDTO.setMessageType(UserMessageTypeConstant.ANTIEPIDEMIC);
+                        messageFormDTO.setTargetId(item.getId());
+                        msgList.add(messageFormDTO);
+                    });
+                }
             }
             //TODO 短信消息
             if (StringUtils.isNotBlank(item.getMobile())) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index b100c64741..e7d124a71d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1267,7 +1267,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 if (houseInfoMap.containsKey(item.getHomeId()) && null != houseInfoMap.get(item.getHomeId())) {
                     HouseInfoDTO houseInfoDTO = houseInfoMap.get(item.getHomeId());
-                    item.setHomeId(houseInfoDTO.getAllName());
+                    item.setHouseName(houseInfoDTO.getAllName());
                 }
             });
         }
@@ -1300,12 +1300,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             //查询房子名称
             Set<String> houseIds = new HashSet<>();
             houseIds.add(result.getHomeId());
-            Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(new HashSet<>(houseIds),formDTO.getCustomerId());
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
             List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
             Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
             if (houseInfoMap.containsKey(result.getHomeId()) && null != houseInfoMap.get(result.getHomeId())) {
                 HouseInfoDTO houseInfoDTO = houseInfoMap.get(result.getHomeId());
-                result.setHomeId(houseInfoDTO.getAllName());
+                result.setHouseName(houseInfoDTO.getAllName());
             }
         }
         return result;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
index 28b4129229..84e3739081 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@@ -21,7 +21,12 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        AND id_card = #{idCard}
+        AND (
+            CREATED_BY = #{userId}
+        <if test='null != idCard and "" != idCard'>
+            OR id_card = #{idCard}
+        </if>
+            )
         ORDER BY nat_time DESC
     </select>
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2b040cd4cd..c68d4e504e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -690,7 +690,7 @@
             AND MOBILE LIKE concat( '%', #{mobile}, '%' )
             </if>
             <if test="idCard != null and idCard != ''">
-            AND ID_CARD LIKE concat( '%', #{idCard}, '%' )
+            AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
             ) t
             WHERE