From e09e955b6b492b40e7ba046783bd168e64b9d566 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 16 Nov 2022 22:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E7=9A=84=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncConfigServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 66ad299ad5..b8b9300d2b 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 @@ -1120,6 +1120,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); } @@ -1143,11 +1149,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(); } }