From a5b8a67bb0cc631d2769dd8fd5c59245bff78a1e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 13 Dec 2018 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=BB=BA=E6=A1=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=85=8D=E5=81=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/ResidentsArchiveQuery.java | 9 ++++++--- .../platform/operate/web/facade/ResidentsArchiveFacade.java | 12 ++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index 4775cf3..4ca0d53 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -176,7 +176,7 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative } if (StringUtils.isNotBlank(spouseName)) { - condition = condition.and("spouseName", "^"+spouseName, MongoOper.LIKE); + condition = condition.and("spouseName", spouseName, MongoOper.LIKE); } if (StringUtils.isNotBlank(vcCardNo)) { @@ -239,10 +239,13 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE); MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("certificateNum", queryNo, MongoOper.IS); + MongoCondition con5 = MongoCondition.newInstance("spouseCardNo", queryNo, MongoOper.IS); + MongoCondition con6 = MongoCondition.newInstance("spousePhone", queryNo, MongoOper.IS); + MongoCondition con7 = MongoCondition.newInstance("spouseName", "^"+queryNo, MongoOper.LIKE); if(c1!=null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4,con5,con6,con7}).getCriteria()); }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4,con5,con6,con7}).getCriteria(); } //condition = condition.and("id", id, MongoOper.IS).orCondition(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 557fd58..82c9589 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -915,9 +915,17 @@ public class ResidentsArchiveFacade{ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); String hospital = autoMatchFacade.getHospitalId(userId); - archiveQuery.setSex(sexId); + if (SystemConfig.MAN_ID.equals(sexId)) + { + archiveQuery.setSex(SystemConfig.WOMAN_ID); + } + else + { + archiveQuery.setSex(SystemConfig.MAN_ID); + } + archiveQuery.setHospitalId(hospital); - archiveQuery.setSpouseName(name); + archiveQuery.setUsername(name); List archiveModelList = residentsArchiveService.queryResident(archiveQuery); List list = new ArrayList<>(); -- 1.8.3.1