diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 901cab765e..636d3ec8f8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1119,6 +1119,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl vaccineList1 = vaccineListJA.toJavaList(YTVaccineListDTO.class); vaccineList1.forEach(v1 -> { v1.setCardno(v.get("cardno").toString()); + + // 秒转换成:00 + Matcher matcher = VACCINE_DATE_OF_API_PATTERN.matcher(v1.getInoculateDate()); + if (matcher.matches()) { + v1.setInoculateDate(matcher.group(1).concat(":00")); + } }); ytVaccineListFromApi.addAll(vaccineList1); } @@ -1142,11 +1148,11 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl iterator = ytVaccineListFromApi.iterator(); while (iterator.hasNext()) { YTVaccineListDTO vaccineFromApi = iterator.next(); - Matcher matcher = VACCINE_DATE_OF_API_PATTERN.matcher(vaccineFromApi.getInoculateDate()); + + // 身份证号和接种时间都一致,移除 if (vaccineFromApi.getCardno().equals(existVaccineItem.getCardno()) - && matcher.matches() - && matcher.group(1).equals(existVaccineItem.getInoculateDate()) - ) { + && vaccineFromApi.getInoculateDate().equals(existVaccineItem.getInoculateDate())) { + iterator.remove(); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 319d7b959a..d5aeb1384d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -227,17 +227,21 @@ - +