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 444c490..6e8197e 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 @@ -212,10 +212,12 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE); MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS); + MongoCondition con4 = MongoCondition.newInstance("certificateNum", queryNo, MongoOper.IS); + if(c1!=null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria()); }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); } //condition = condition.and("id", id, MongoOper.IS).orCondition(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 26c916a..7e4efa3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -234,10 +234,11 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); if(c1!=null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria()); }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 8ceaa8f..cc5dd87 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -643,6 +643,8 @@ public class ApplyOrderFacade { parentIds.add(pa.getId()); } referralApplyOrderQuery.setParentIds(parentIds); + } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(referralApplyOrderQuery.getQueryNo())) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyOrderQuery.getPageInfo()); } referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); Date currentDate = DateUtil.formatDate(new Date()); @@ -730,6 +732,7 @@ public class ApplyOrderFacade { } referralApplyOrderQuery.setOutHospitalId(hospital); } + List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); List data = new ArrayList(); 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 fdf0dbe..259564d 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 @@ -542,7 +542,7 @@ public class ResidentsArchiveFacade{ query.setPage(queryRequest.getPage()); query.setNeed(need); query.setYn(YnEnums.YES.getId()); - + query.setQueryNo(queryRequest.getQueryNo()); if (hospitalId!=null){ query.setHospitalId(hospitalId); }