jiangjiazhi / regional-platform

Authored by Administrator about 6 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 7 additions and 3 deletions

...	...	@@ -47,6 +47,7 @@
47	47
48	48	@Override
49	49	public BaseResponse queryFolvite(String vcCardNo, String cardNo, String certificateTypeId, Integer userId) {
	50	+ Map<String, Object> response = new HashMap<>();
50	51	String hospitalId = autoMatchFacade.getHospitalId(userId);
51	52	FolviteQuery folviteQuery = new FolviteQuery();
52	53	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
...	...	@@ -86,9 +87,12 @@
86	87	//获取最新的档案
87	88	ResidentsArchiveModel archiveModel = archiveModels.get(0);
88	89	FolviteResult result = result(archiveModel);
89		- BaseResponse response = new BaseResponse();
90		- response.setObject(result);
91		- return response;
	90	+ BaseResponse responses = new BaseResponse();
	91	+ response.put("baseInfo", data);
	92	+ response.put("history", "历史记录");
	93	+ response.put("womanRecord", result);
	94	+ responses.setObject(response);
	95	+ return responses;
92	96	}
93	97
94	98	FolviteResult result(ResidentsArchiveModel archiveModel) {