jiangjiazhi / regional-platform

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 19 additions and 0 deletions

...	...	@@ -2747,6 +2747,11 @@
2747	2747	}
2748	2748
2749	2749
	2750	+ //儿童户籍查询(省市县区)
	2751	+ babyQuery.setBabyProvinceId(request.getBabyProvinceId());
	2752	+ babyQuery.setBabyCityId(request.getBabyCityId());
	2753	+ babyQuery.setBabyAreaId(request.getBabyAreaId());
	2754	+ babyQuery.setBabyStreetId(request.getBabyStreetId());
2750	2755	//结案查询
2751	2756	babyQuery.setEndCase(request.getEndCase());
2752	2757	//体弱儿详情

...	...	@@ -64,7 +64,10 @@
64	64
65	65	private String hospitalName;
66	66
	67	+ //儿童居住地
67	68	private String completeAddress;
	69	+ //儿童户籍地
	70	+ private String registerAddress;
68	71
69	72	private String cardNo;
70	73
...	...	@@ -125,6 +128,14 @@
125	128
126	129	//隆化-儿童健康体检统计表 -体检套餐对应检查时间
127	130	private List<Map> dataResult;
	131	+
	132	+ public String getRegisterAddress() {
	133	+ return registerAddress;
	134	+ }
	135	+
	136	+ public void setRegisterAddress(String registerAddress) {
	137	+ this.registerAddress = registerAddress;
	138	+ }
128	139
129	140	public List<Map> getDataResult() {
130	141	return dataResult;

...	...	@@ -250,6 +250,9 @@
250	250	result.setSettleType(model.getSettleType());
251	251	//隆化-儿童建档-自动结案时间
252	252	result.setSettleTime(DateUtil.getyyyy_MM_dd(model.getSettleTime()));
	253	+ //儿童档案户籍地址
	254	+ String registerAddress= CommonsHelper.getResidence(model.getBabyProvinceId(), model.getBabyCityId(), model.getBabyAreaId(), model.getBabyStreetId(), model.getBabyAddress(), basicConfigService);
	255	+ result.setRegisterAddress(registerAddress);
253	256	list.add(result);
254	257	}
255	258	}