From 587cfeb99b52be35de2fb2a173d21d5e02e03e41 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 13 Jun 2024 16:28:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?improvement=EF=BC=9A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=97=85=E6=A1=88=E5=8F=B7=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=86=99=E5=AF=B9=E6=AF=94=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/demo/service/SyncBasicDataImpl.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/docus/demo/service/SyncBasicDataImpl.java b/src/main/java/com/docus/demo/service/SyncBasicDataImpl.java index ba2c4e7..aeb3fa8 100644 --- a/src/main/java/com/docus/demo/service/SyncBasicDataImpl.java +++ b/src/main/java/com/docus/demo/service/SyncBasicDataImpl.java @@ -2,6 +2,7 @@ package com.docus.demo.service; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.docus.demo.dto.SyncBasicDataDto; import com.docus.demo.entity.CommonResult; import com.docus.demo.entity.Tbasic; @@ -23,6 +24,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; @@ -62,7 +64,11 @@ public class SyncBasicDataImpl implements ISyncBasicDataService { } log.info("开始同步"+tpatientvisitList.size()); // tpatientvisitList = paintVisitMapper.getTpatientVisitList((current - 1) * limit, current*limit, syncBasicDataDto); - + for (Tpatientvisit e : tpatientvisitList) { + if(StrUtil.isNotBlank(e.getFprn())){ + e.setFprn(e.getFprn().toLowerCase(Locale.ROOT)); + } + } List fprnList = tpatientvisitList.stream().map(Tpatientvisit::getFprn).collect(Collectors.toList()); List ftimesList = tpatientvisitList.stream().map(Tpatientvisit::getFtimes).distinct().collect(Collectors.toList()); @@ -108,7 +114,7 @@ public class SyncBasicDataImpl implements ISyncBasicDataService { return tpatientvisitList.stream().map(m -> { Tbasic oldBasic = oldBasicList.stream() - .filter(old -> ObjectUtil.equal(m.getFprn(), old.getInpatientNo()) + .filter(old -> ObjectUtil.equal(m.getFprn(), old.getInpatientNo().toLowerCase(Locale.ROOT)) && ObjectUtil.equal(m.getFtimes(), old.getAdmissTimes()) && ObjectUtil.equal(m.getFname(), old.getName()) ) @@ -201,6 +207,11 @@ public class SyncBasicDataImpl implements ISyncBasicDataService { break; } log.info(syncBasicDataDto.getStartDate() + " " + syncBasicDataDto.getEndDate() + "开始同步" + cardInfoList.size()); + for (CardInfo e : cardInfoList) { + if(StrUtil.isNotBlank(e.getPatNo())){ + e.setPatNo(e.getPatNo().toLowerCase(Locale.ROOT)); + } + } List fprnList = cardInfoList.stream().map(CardInfo::getPatNo).collect(Collectors.toList()); //数据map转换 List oldBasicList = basicMapper.getOldBasicList(fprnList, syncBasicDataDto); @@ -235,7 +246,7 @@ public class SyncBasicDataImpl implements ISyncBasicDataService { Integer pNum = f.getPatNum(); Tbasic tbasic = oldBasicList.stream().filter(o -> - ObjectUtil.equal(pno, o.getInpatientNo()) + ObjectUtil.equal(pno, o.getInpatientNo().toLowerCase(Locale.ROOT)) && ObjectUtil.equal(name, o.getName()) && ObjectUtil.equal(pNum, o.getAdmissTimes()) ) From fe7e44833df068296f2f15373052d9ca31eedee4 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 13 Jun 2024 16:29:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?improvement=EF=BC=9A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=97=85=E6=A1=88=E5=8F=B7=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=86=99=E5=AF=B9=E6=AF=94=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b83d222..bef0727 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target/ +.idea From b946467fe218ec15a2127a16dbd700c8ca274a16 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 13 Jun 2024 16:29:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?improvement=EF=BC=9A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=97=85=E6=A1=88=E5=8F=B7=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=86=99=E5=AF=B9=E6=AF=94=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bef0727..bba7b53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /target/ -.idea +/.idea/