jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 7 additions and 4 deletions

...	...	@@ -216,7 +216,7 @@
216	216	}
217	217
218	218	/**
219		- * 服务类型
	219	+ * 服务状态
220	220	* @return
221	221	*/
222	222	@RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)

...	...	@@ -399,7 +399,7 @@
399	399	* @return
400	400	*/
401	401	public BaseObjectResponse getBabyBuildBaseConfig() {
402		- Map<String,List> map = new HashMap();
	402	+ Map<String,Object> map = new HashMap();
403	403
404	404	//证件类型
405	405	List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
...	...	@@ -436,6 +436,8 @@
436	436	//体验类型
437	437	List expType = ExpEnums.getExpEnums();
438	438	map.put("expType", expType);
	439	+
	440	+ map.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
439	441
440	442
441	443

...	...	@@ -131,7 +131,7 @@
131	131	}
132	132
133	133	//历史建档记录
134		- List<Map<String,List>> list = new ArrayList<>();
	134	+ List<Map> list = new ArrayList<>();
135	135	List<BookbuildingRecordResult> results = new ArrayList<>();
136	136	if (CollectionUtils.isNotEmpty(patients))
137	137	{
138	138
...	...	@@ -191,8 +191,9 @@
191	191	list.add(typeMap);
192	192
193	193
194		- Map<String,List> mapData = new HashMap<>();
	194	+ Map<String,Object> mapData = new HashMap<>();
195	195	mapData.put("data",results);
	196	+ mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
196	197	list.add(mapData);
197	198
198	199	BaseListResponse listResponse = new BaseListResponse();