jiangjiazhi / regional-platform

Authored by liquanyu about 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 22 additions and 7 deletions

...	...	@@ -108,6 +108,7 @@
108	108	private List<String> fmHospitalList;
109	109	private String fsHospital;
110	110	private String fsHospitalId;
	111	+ private boolean isQueryFsHospitalId;
111	112	/**
112	113	* 预约联系结果（1-成功、2-失败）
113	114	*/
...	...	@@ -183,6 +184,14 @@
183	184	private String areaZJId;
184	185	private String streetZJId;
185	186
	187	+ public Boolean getIsQueryFsHospitalId() {
	188	+ return isQueryFsHospitalId;
	189	+ }
	190	+
	191	+ public void setIsQueryFsHospitalId(Boolean isQueryFsHospitalId) {
	192	+ this.isQueryFsHospitalId = isQueryFsHospitalId;
	193	+ }
	194	+
186	195	public String getProvinceZJId() {
187	196	return provinceZJId;
188	197	}
...	...	@@ -419,9 +428,16 @@
419	428	}
420	429	}
421	430	if (null != fsHospitalId) {
422		- MongoCondition con1 = MongoCondition.newInstance("fsHospital", fsHospitalId, MongoOper.IS);
423		- MongoCondition con2 = MongoCondition.newInstance("fsHospital", false, MongoOper.EXISTS);
424		- condition.orCondition(con1, con2);
	431	+ if (isQueryFsHospitalId)
	432	+ {
	433	+ condition.and("fsHospital", fsHospitalId, MongoOper.IS);
	434	+ }
	435	+ else
	436	+ {
	437	+ MongoCondition con1 = MongoCondition.newInstance("fsHospital", fsHospitalId, MongoOper.IS);
	438	+ MongoCondition con2 = MongoCondition.newInstance("fsHospital", false, MongoOper.EXISTS);
	439	+ condition.orCondition(con1, con2);
	440	+ }
425	441	}
426	442
427	443

...	...	@@ -1881,16 +1881,15 @@
1881	1881
1882	1882	// 访视列表无需加上分娩医院，因此注释
1883	1883	//matDeliverQuery.setFmHospitalList(hospitalList);
	1884	+
	1885	+ matDeliverQuery.setFsHospitalId(hospitalId);
1884	1886	if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea()))
1885	1887	{
1886	1888	if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId()))
1887	1889	{
	1890	+ matDeliverQuery.setIsQueryFsHospitalId(true);
1888	1891	matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());
1889	1892	}
1890		- }
1891		- else
1892		- {
1893		- matDeliverQuery.setFsHospitalId(hospitalId);
1894	1893	}
1895	1894
1896	1895