jiangjiazhi / regional-platform | GitLab

Commit 9b7762ce6e64c8f365c806dacd3cb1641165d2ad

Authored by yangfei over 8 years ago

1 parent 3f5fdb0b16

Exists in master and in 6 other branches

查询号bug修改

Showing 4 changed files with 11 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java

...	...	@@ -212,10 +212,12 @@
212	212	MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
213	213	MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE);
214	214	MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
	215	+ MongoCondition con4 = MongoCondition.newInstance("certificateNum", queryNo, MongoOper.IS);
	216	+
215	217	if(c1!=null) {
216		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
	218	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria());
217	219	}else {
218		- c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
	220	+ c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
219	221	}
220	222	//condition = condition.and("id", id, MongoOper.IS).orCondition();
221	223	}

...	...	@@ -234,10 +234,11 @@
234	234	MongoCondition c = MongoCondition.newInstance();
235	235	MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
236	236	MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS);
	237	+ MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
237	238	if(c1!=null) {
238		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	239	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
239	240	}else {
240		- c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	241	+ c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria();
241	242	}
242	243	}
243	244

...	...	@@ -643,6 +643,8 @@
643	643	parentIds.add(pa.getId());
644	644	}
645	645	referralApplyOrderQuery.setParentIds(parentIds);
	646	+ } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(referralApplyOrderQuery.getQueryNo())) {
	647	+ return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyOrderQuery.getPageInfo());
646	648	}
647	649	referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
648	650	Date currentDate = DateUtil.formatDate(new Date());
...	...	@@ -730,6 +732,7 @@
730	732	}
731	733	referralApplyOrderQuery.setOutHospitalId(hospital);
732	734	}
	735	+
733	736	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
734	737
735	738	List data = new ArrayList();

...	...	@@ -542,7 +542,7 @@
542	542	query.setPage(queryRequest.getPage());
543	543	query.setNeed(need);
544	544	query.setYn(YnEnums.YES.getId());
545		-
	545	+ query.setQueryNo(queryRequest.getQueryNo());
546	546	if (hospitalId!=null){
547	547	query.setHospitalId(hospitalId);
548	548	}