Merge remote-tracking branch 'remotes/origin/dev_data_update_config' into 烟台-政务master

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java

@@ -89,12 +89,17 @@ 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();
                     if (NumConstant.ONE_STR.equals(sample_result_pcr)) {
+                        // 检测结果(0:阴性  1:阳性):接口填入
                         compareRecordEntity.setNatResult(NumConstant.ONE_STR);
                     } else if (NumConstant.TWO_STR.equals(sample_result_pcr)) {
                         compareRecordEntity.setNatResult(NumConstant.ZERO_STR);