jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 14 additions and 1 deletions

...	...	@@ -474,6 +474,7 @@
474	474	private String fmHospital;
475	475	// 这个是分娩医院+建档医院的综合查询
476	476	private List<String> fmHospitalQueryList;
	477	+ private List<String> fmHospitalList;
477	478	// 分娩年龄
478	479	private Integer fmAgeStart;
479	480	private Integer fmAgeEnd;
...	...	@@ -490,6 +491,14 @@
490	491	private Integer postViewTimesStart;
491	492	private Integer postViewTimesEnd;
492	493
	494	+ public List<String> getFmHospitalList() {
	495	+ return fmHospitalList;
	496	+ }
	497	+
	498	+ public void setFmHospitalList(List<String> fmHospitalList) {
	499	+ this.fmHospitalList = fmHospitalList;
	500	+ }
	501	+
493	502	public Integer getPostViewTimesStart() {
494	503	return postViewTimesStart;
495	504	}
...	...	@@ -1206,6 +1215,10 @@
1206	1215	}else{
1207	1216	c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1208	1217	}
	1218	+ }
	1219	+
	1220	+ if (CollectionUtils.isNotEmpty(fmHospitalList)) {
	1221	+ condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
1209	1222	}
1210	1223
1211	1224	if (lastCheckEmployeeId != null) {

...	...	@@ -428,7 +428,7 @@
428	428
429	429	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCprovinceId()))
430	430	{
431		- patientsQuery.setFmHospitalQueryList(hospitalList);
	431	+ patientsQuery.setFmHospitalList(hospitalList);
432	432	}
433	433
434	434	} else {