From 3ff3db3f05fb9c7a527d94a5faab095c7c47b61c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 14 Nov 2022 15:41:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?=
 =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?internalRemark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/handler/IcNatCompareRecordExcelImportListener.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
index 3ebe113874..3bda1ff40f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
@@ -233,7 +233,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             } else {
                                 // 采样时间不一致，说明未出结果
-                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                compareRecordEntity.setInternalRemark(String.format("未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
                                         DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
                                         DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             }

From ac775efdfe7200a5a3a552894e776cb373d3b7ea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 14 Nov 2022 15:57:12 +0800
Subject: [PATCH 2/2] zhushi

---
 .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
index 503669e07f..1af182250a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
@@ -227,7 +227,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
      */
     @Transactional(rollbackFor = Exception.class)
     public void persisNat(IcNatCompareRecordEntity data, CustomerStaffInfoCacheResult staffInfo, String importDate, Date importTime) {
-        // 查询是否本辖区居民
+        // 查询是否本辖区居民 没有限制status='0'
         IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByIdCard(data.getCustomerId(), data.getIdCard(), null);
         AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
         //根据身份证号判断是否存在基础信息