jiangjiazhi / regional-platform

Commit 3e54828d11cc27c75e28041f3399506e2328ab9b

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 4 changed files with 28 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java

...	...	@@ -209,7 +209,16 @@
209	209	private String provinceId;
210	210
211	211	private String cityId;
	212	+ private String streetId;
212	213
	214	+ public String getStreetId() {
	215	+ return streetId;
	216	+ }
	217	+
	218	+ public void setStreetId(String streetId) {
	219	+ this.streetId = streetId;
	220	+ }
	221	+
213	222	public String getProvinceId() {
214	223	return provinceId;
215	224	}
...	...	@@ -557,6 +566,9 @@
557	566	}
558	567	if (null != areaId) {
559	568	condition = condition.and("areaId", areaId, MongoOper.IS);
	569	+ }
	570	+ if (null != streetId) {
	571	+ condition = condition.and("streetId", streetId, MongoOper.IS);
560	572	}
561	573
562	574	if (null != enable) {

...	...	@@ -204,6 +204,7 @@
204	204	@RequestParam(value = "provinceId",required = false) String provinceId,
205	205	@RequestParam(value = "cityId",required = false) String cityId,
206	206	@RequestParam(value = "areaId",required = false) String areaId,
	207	+ @RequestParam(value = "streetId",required = false) String streetId,
207	208	@RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
208	209	@RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
209	210	@RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
...	...	@@ -236,6 +237,7 @@
236	237	request.setCityId(cityId);
237	238	// 区/县
238	239	request.setAreaId(areaId);
	240	+ request.setStreetId(streetId);
239	241	// 建档医院
240	242	request.setHospitalProvinceId(hospitalProvinceId);
241	243	request.setHospitalCityId(hospitalCityId);
...	...	@@ -272,6 +274,7 @@
272	274	@RequestParam(value = "provinceId",required = false) String provinceId,
273	275	@RequestParam(value = "cityId",required = false) String cityId,
274	276	@RequestParam(value = "areaId",required = false) String areaId,
	277	+ @RequestParam(value = "streetId",required = false) String streetId,
275	278	@RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
276	279	@RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
277	280	@RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
...	...	@@ -303,6 +306,7 @@
303	306	request.setCityId(cityId);
304	307	// 区/县
305	308	request.setAreaId(areaId);
	309	+ request.setStreetId(streetId);
306	310	// 建档医院
307	311	request.setHospitalProvinceId(hospitalProvinceId);
308	312	request.setHospitalCityId(hospitalCityId);

...	...	@@ -2070,6 +2070,8 @@
2070	2070	babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId());
2071	2071	// 区/县
2072	2072	babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId());
	2073	+
	2074	+ babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
2073	2075	babyQuery.setQueryNo(request.getQueryNo());
2074	2076	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC);
2075	2077

...	...	@@ -64,6 +64,8 @@
64	64
65	65	private String areaId;
66	66
	67	+ private String streetId;
	68	+
67	69	private String hospitalProvinceId;
68	70
69	71	private String hospitalCityId;
...	...	@@ -81,6 +83,14 @@
81	83	private String evaluate;
82	84	//查询号
83	85	private String queryNo;
	86	+
	87	+ public String getStreetId() {
	88	+ return streetId;
	89	+ }
	90	+
	91	+ public void setStreetId(String streetId) {
	92	+ this.streetId = streetId;
	93	+ }
84	94
85	95	public String getQueryNo() {
86	96	return queryNo;