jiangjiazhi / regional-platform

Commit ede75819299b1b3e15deb3dae0c75356b1657adc

Authored by tranny over 4 years ago

Exists in master and in 6 other branches

儿童眼保健检查

Showing 1 changed file with 19 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -593,10 +593,16 @@
593	593	*/
594	594	@Override
595	595	public BaseResponse infoQhd(String id) {
	596	+
	597	+ Map<String, Object> map = getBabyEyeCheckViewQhd(id);
	598	+ return RespBuilder.buildSuccess(map);
	599	+ }
	600	+
	601	+
	602	+ private Map<String, Object> getBabyEyeCheckViewQhd(String id)
	603	+ {
596	604	BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
597		- if (babyEyeCheck == null) {
598		- return RespBuilder.buildSuccess();
599		- }
	605	+
600	606	Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
601	607	map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : "");
602	608	map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus()));
...	...	@@ -761,7 +767,7 @@
761	767	map.put("filePath", filePath);
762	768	//
763	769	CollectionUtils.removeNullValue(map);
764		- return RespBuilder.buildSuccess(map);
	770	+ return map;
765	771	}
766	772
767	773	private String parseYinYang(String s) {
...	...	@@ -2007,8 +2013,15 @@
2007	2013	temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
2008	2014	temp.put("type", "2");
2009	2015	CollectionUtils.removeNullValue(temp);
2010		-
2011		- Map<String, Object> map = getEyeCheckView(babyEyeCheck.getId());
	2016	+ Map<String, Object> map = null;
	2017	+ if ("216".equals(hospitalId))
	2018	+ {
	2019	+ map = getBabyEyeCheckViewQhd(babyEyeCheck.getId());
	2020	+ }
	2021	+ else
	2022	+ {
	2023	+ map = getEyeCheckView(babyEyeCheck.getId());
	2024	+ }
2012	2025	temp.put("viewData",map);
2013	2026
2014	2027	datas.add(temp);