From 4d816d001a50d558692ca5c4b2b3d43777ebfe4a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 30 Jul 2016 16:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/PersonModelQuery.java | 9 +++++---- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java index 4ec990b..c855b0d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java @@ -46,10 +46,11 @@ public class PersonModelQuery extends BaseQuery implements IConvertToNativeQuery public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); - if (null != cardNo && phone != null) { - MongoCondition con1 = MongoCondition.newInstance("cardNo", cardNo, MongoOper.IS); - MongoCondition con = MongoCondition.newInstance("phone", phone, MongoOper.IS); - condition = condition.orCondition(new MongoCondition[]{con1, con}); + if (null != cardNo) { + condition = condition.and("cardNo", cardNo, MongoOper.IS); + } + if (phone != null) { + condition = condition.and("phone", phone, MongoOper.IS); } if (!StringUtils.isEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 6b4b703..00d4b56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -102,6 +102,7 @@ public class BookbuildingFacade { { PersonModelQuery personModelQuery = new PersonModelQuery(); personModelQuery.setPhone(yunRequest.getPregnantPhone()); + personModelQuery.setCardNo(yunRequest.getPregnantCertificateNum()); personModelQuery.setYn(YnEnums.YES.getId()); List personModels = personService.queryPersons(personModelQuery); PersonModel pmodel = new PersonModel(); -- 1.8.3.1