Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -186,13 +186,13 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                 if (CollectionUtils.isNotEmpty(hscyList) && MapUtils.isNotEmpty(hscyList.get(0))) {
                     // 存在 最近一条采样记录
                     Map<String, Object> 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<Map<String, Object>> 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<IcNat
                         if (CollectionUtils.isNotEmpty(hsjcResultList) && MapUtils.isNotEmpty(hsjcResultList.get(0))) {
                             Map<String, Object> 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<IcNat
                             // 最近一次采样时间，与最近一次检测结果的采样时间相比较
                             if (compareRecordEntity.getLatestCyTime().equals(sample_time)) {
                                 // 一致说明出结果了
-                                if (StringUtils.isNotBlank(test_time)) {
+                                if (test_time != null) {
                                     // 赋值最近一次核酸时间
-                                    compareRecordEntity.setLatestNatTime(DateUtils.parse(test_time, DateUtils.DATE_TIME_PATTERN));
+                                    compareRecordEntity.setLatestNatTime(test_time);
                                 }
                                 // 赋值检测地点
                                 compareRecordEntity.setNatAddress(StringUtils.isNotBlank(sampling_org_pcr) ? sampling_org_pcr : StrConstant.EPMETY_STR);
@@ -230,7 +230,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                                 compareRecordEntity.setContactAddress(StringUtils.isNotBlank(address) ? address : StrConstant.EPMETY_STR);
                             } else {
                                 // 采样时间不一致，说明未出结果
-                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s", compareRecordEntity.getLatestCyTime(), sample_time));
+                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s", compareRecordEntity.getLatestCyTime(), DateUtils.format(sample_time)));
                             }
                         } else {
                             compareRecordEntity.setInternalRemark("最近一次检测结果为空");