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 d163fc0192..531e977ea7 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 @@ -186,13 +186,13 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener latestCyMap = hscyList.get(0); - String create_time = (String) latestCyMap.get("create_time"); - if (StringUtils.isBlank(create_time)) { + Date create_time = (Date) latestCyMap.get("create_time"); + if (create_time == null) { // 最近一次采样时间为空,说明这人好久不做核酸了 compareRecordEntity.setInternalRemark("采样时间create_time is null"); } else { // 赋值采样时间 - compareRecordEntity.setLatestCyTime(DateUtils.parse(create_time, DateUtils.DATE_TIME_PATTERN)); + compareRecordEntity.setLatestCyTime(create_time); // 查询最后一次检测结果 List> hsjcResultList = yantaiNamedParamLantuJdbcTemplate.queryForList( "select name, telephone, card_no, address, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no =:idcard order by test_time desc limit 1", args); @@ -200,9 +200,9 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener latestJcMap = hsjcResultList.get(0); // 采样时间 - String sample_time = (String) latestJcMap.get("SAMPLE_TIME"); + Date sample_time = (Date) latestJcMap.get("SAMPLE_TIME"); // 检测时间 - String test_time = (String) latestJcMap.get("test_time"); + Date test_time = (Date) latestJcMap.get("test_time"); // 核酸采样机构 String sampling_org_pcr = (String) latestJcMap.get("SAMPLING_ORG_PCR"); // 核酸检测结果 1:阳性,2:阴性 @@ -213,9 +213,9 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener