From eb2724efe8d9a4e7efecafcf1de8c9947c4e1708 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 17 Nov 2021 13:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=84=BF=E4=BF=9D=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 582856d..4cc5887 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -184,13 +184,12 @@ public class BabyHealthFacade extends BaseServiceImpl { if(null!=queryStartBirth&&null!=queryEndtBirth){ criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); } - Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { - pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), + criteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); flag = true; } - PageResult pageResult = findMongoPage(BabyModel.class, new Query(pCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); + PageResult pageResult = findMongoPage(BabyModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babykModelsList = (List) pageResult.getGrid(); List> grid = new ArrayList<>(); -- 1.8.3.1