diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 9744ab2..33e4484 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2208,10 +2208,13 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setYn(YnEnums.YES.getId()); + //去掉yn为1的,程序去处理优化查询 +// babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setPhoneOrcardNo(cardNo); //获取最近一次的建档记录 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + //去掉删除的数据 + removeDeleted(models); if (CollectionUtils.isNotEmpty(models)) { BabyModel babyModel = models.get(0); @@ -2270,6 +2273,20 @@ public class BabyBookbuildingFacade { return objectResponse; } + /** + * 移除yn为0 的 + * @param babyModels + */ + private void removeDeleted(List babyModels){ + if(CollectionUtils.isNotEmpty(babyModels)){ + for(int i=0;i