diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 5d59167..3aef5a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -593,10 +593,16 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC */ @Override public BaseResponse infoQhd(String id) { + + Map map = getBabyEyeCheckViewQhd(id); + return RespBuilder.buildSuccess(map); + } + + + private Map getBabyEyeCheckViewQhd(String id) + { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); - if (babyEyeCheck == null) { - return RespBuilder.buildSuccess(); - } + Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : ""); map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus())); @@ -761,7 +767,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("filePath", filePath); // CollectionUtils.removeNullValue(map); - return RespBuilder.buildSuccess(map); + return map; } private String parseYinYang(String s) { @@ -2007,8 +2013,15 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); temp.put("type", "2"); CollectionUtils.removeNullValue(temp); - - Map map = getEyeCheckView(babyEyeCheck.getId()); + Map map = null; + if ("216".equals(hospitalId)) + { + map = getBabyEyeCheckViewQhd(babyEyeCheck.getId()); + } + else + { + map = getEyeCheckView(babyEyeCheck.getId()); + } temp.put("viewData",map); datas.add(temp);