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 a032dc4..4775cf3 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 @@ -113,6 +113,7 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative private List hospitalIds; private String queryNo; + private String spouseName; public String getQueryNo() { return queryNo; @@ -174,6 +175,10 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); } + if (StringUtils.isNotBlank(spouseName)) { + condition = condition.and("spouseName", "^"+spouseName, MongoOper.LIKE); + } + if (StringUtils.isNotBlank(vcCardNo)) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } @@ -234,13 +239,10 @@ 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,con5,con6,con7}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria()); }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4,con5,con6,con7}).getCriteria(); + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); } //condition = condition.and("id", id, MongoOper.IS).orCondition(); } @@ -251,6 +253,14 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative return condition.toMongoQuery(); } + public String getSpouseName() { + return spouseName; + } + + public void setSpouseName(String spouseName) { + this.spouseName = spouseName; + } + public Date getStartBuildDay() { return startBuildDay; } 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 e7de732..557fd58 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 @@ -917,7 +917,7 @@ public class ResidentsArchiveFacade{ String hospital = autoMatchFacade.getHospitalId(userId); archiveQuery.setSex(sexId); archiveQuery.setHospitalId(hospital); - archiveQuery.setQueryNo(name); + archiveQuery.setSpouseName(name); List archiveModelList = residentsArchiveService.queryResident(archiveQuery); List list = new ArrayList<>();