From 70a2ecf76d8fc77b63c4ec5662ee27a773c1272b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Sep 2022 10:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=9C=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/IcNatCompareRecordExcelImportListener.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 f18b256247..9abf0536d1 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
@@ -89,8 +89,12 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                 if (null != hsjcResDTO && CollectionUtils.isNotEmpty(hsjcResDTO.getData()) && null != hsjcResDTO.getData().get(0)) {
                     YtHsjcResDetailDTO ytHsjcResDetailDTO = hsjcResDTO.getData().get(0);
                     String testTime = ytHsjcResDetailDTO.getTest_time();
-                    compareRecordEntity.setLatestNatTime(DateUtils.parse(testTime, DateUtils.DATE_PATTERN));
-                    compareRecordEntity.setNatAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getSampling_org_pcr()) ? ytHsjcResDetailDTO.getSample_result_pcr() : StrConstant.EPMETY_STR);
+                    if (StringUtils.isNotBlank(testTime)) {
+                        // 赋值最近一次核酸时间
+                        compareRecordEntity.setLatestNatTime(DateUtils.parse(testTime, DateUtils.DATE_TIME_PATTERN));
+                    }
+                    // 赋值检测地点
+                    compareRecordEntity.setNatAddress(StringUtils.isNotBlank(ytHsjcResDetailDTO.getSampling_org_pcr()) ? ytHsjcResDetailDTO.getSampling_org_pcr() : StrConstant.EPMETY_STR);
 
                     // "sample_result_pcr":"2",// 核酸检测结果 1:阳性,2:阴性
                     String sample_result_pcr = ytHsjcResDetailDTO.getSample_result_pcr();