diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
index de70acadb5..dbd32f4463 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
@@ -1,13 +1,13 @@
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 
 /**
  * 核酸上报记录
@@ -31,16 +31,6 @@ public class IcNatDTO implements Serializable {
      */
     private String customerId;
 
-    /**
-     * 居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id
-     */
-    private String agencyId;
-
-    /**
-     * 组织pids
-     */
-    private String pids;
-
     /**
      * 是否客户下居民(0:否  1:是)
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
index 44833b62d3..7744ce67c6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
@@ -29,16 +29,6 @@ public class IcNatEntity extends BaseEpmetEntity {
 	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
-    /**
-     * 居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id
-     */
-	private String agencyId;
-
-    /**
-     * 组织pids
-     */
-	private String pids;
-
 	/**
 	 * 是否客户下居民(0:否  1:是)
 	 */
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 1d06cd6b0d..dccc8d106a 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
@@ -68,8 +68,8 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
             }
 
             IcNatEntity icNatEntity = ConvertUtils.sourceToTarget(data, IcNatEntity.class);
-            icNatEntity.setAgencyId(currentAgencyId);
-            icNatEntity.setPids(currentAgencyPids);
+            //icNatEntity.setAgencyId(currentAgencyId);
+            //icNatEntity.setPids(currentAgencyPids);
             icNatEntity.setUserId(currentUserId);
             icNatEntity.setUserType("import");
             icNatEntity.setNatResult(natResult);
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 264d89f873..f80c0624f2 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
@@ -136,7 +136,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     public List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO) {
         //1.根据token信息查询居民身份证号
         UserBaseInfoResultDTO dto = userBaseInfoDao.selectListByUserIdList(formDTO.getUserId());
-        formDTO.setIdCard(dto.getIdNum());
+        if (null != dto) {
+            formDTO.setIdCard(dto.getIdNum());
+        }
         //2.查询当前人员创建的或该身份证号录入的核算检测数据(居民端录入、数字平台录入、数字平台导入、数字平台同步的)
         List<MyNatListResultDTO> resultList = baseDao.getMyNatList(formDTO);
         return resultList;
@@ -162,7 +164,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
                     .doSelectPageInfo(() -> baseDao.getNatList(formDTO));
             return new PageData(data.getList(), data.getTotal());
-        } else if ("current".equals(formDTO.getOrgType())) {
+        } else if ("all".equals(formDTO.getOrgType())) {
             //客户下数据
             PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
                     .doSelectPageInfo(() -> baseDao.getCustomerNatList(formDTO));
@@ -242,7 +244,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         //1.确定删除则需要删除基础数据以及所有可能存在的关系数据，物理删除业务数据
         if (baseDao.delById(formDTO.getIcNatId()) < NumConstant.ONE) {
             log.error(String.format("数据删除失败,核酸记录Id->%s", formDTO.getIcNatId()));
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据操作失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据删除失败");
         }
         //关系数据删除
         icNatRelationDao.delRelation(formDTO.getIcNatId(), null);
@@ -267,7 +269,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
         }
         //2.不管是否已存在关系数据都是先删后增
-        icNatRelationDao.delRelation(formDTO.getIcNatId(), null);
+        icNatRelationDao.delRelation(formDTO.getIcNatId(), staffInfo.getAgencyId());
         //3.新增关系数据
         IcNatRelationEntity relationEntity = new IcNatRelationEntity();
         relationEntity.setCustomerId(formDTO.getCustomerId());
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 0c011b7e19..66a10d467d 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
@@ -110,7 +110,6 @@
     <select id="getNatDTO" resultType="com.epmet.dto.IcNatDTO">
         SELECT
             id,
-            agency_id,
             user_id,
             user_type,
             `name`,