From c4dbc0cd7b1ce9830176f692121621752df26416 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 13 Dec 2018 11:24:39 +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 --- .../main/java/com/lyms/platform/query/ResidentsArchiveQuery.java | 8 +++++--- .../lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 4 ++++ 2 files changed, 9 insertions(+), 3 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 f03dbe8..a032dc4 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 @@ -234,11 +234,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 e1681fd..5cc3f53 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 @@ -636,6 +636,10 @@ public class ResidentsArchiveFacade{ map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); map.put("buildDoctor",model.getPublishName()); + + map.put("spouseName",model.getSpouseName()); + map.put("spouseCardNo",model.getSpouseCardNo()); + map.put("spousePhone",model.getSpousePhone()); data.add(map); } } -- 1.8.3.1