diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java index b82e01f..020ba7f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java @@ -10,7 +10,9 @@ public enum EyePositionEnums { INTERNAL_OBLIQUE(2, "内斜"), EXTERNAL_OBLIQUE(3, "外斜"), SUPERIOR_OBLIQUE_MUSCLE(4, "上斜肌肌麻痹"), - OTHER(5, "其他"); + OTHER(5, "其他"), + QHZ(6, "欠合作"); + private Integer id; private String name; @@ -25,13 +27,13 @@ public enum EyePositionEnums { return null; } - EyePositionEnums(Integer id, String name){ + EyePositionEnums(Integer id, String name) { this.id = id; this.name = name; } public static String getName(String id) { - if(StringUtils.isEmpty(id)) { + if (StringUtils.isEmpty(id)) { return null; } int i = Integer.parseInt(id); 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 427aa26..614b8a1 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 @@ -161,7 +161,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC return RespBuilder.buildSuccess(); } Map map = ReflectionUtils.beanToMap(babyEyeCheck); - map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : ""); + map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : ""); map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus())); map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); @@ -254,11 +254,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("corneal", parseYinYang(babyEyeCheck.getCorneal(), babyEyeCheck.getCornealOther())); map.put("lacrimalApparatus", parseYinYang(babyEyeCheck.getLacrimalApparatus(), babyEyeCheck.getLacrimalApparatusOther())); //一下都是医生选定阳性 - map.put("eyePosition2", babyEyeCheck.getEyePosition2()); - map.put("redLeft2", babyEyeCheck.getRedLeft2()); - map.put("vision2", babyEyeCheck.getVision2()); - map.put("y2", babyEyeCheck.getY2()); - map.put("refraction2", babyEyeCheck.getRefraction2()); + map.put("eyePosition2", "yang".equals(babyEyeCheck.getEyePosition2()) ? "医生判定阳性" : ""); + map.put("redLeft2", "yang".equals(babyEyeCheck.getRedLeft2()) ? "医生判定阳性" : ""); + map.put("vision2", "yang".equals(babyEyeCheck.getVision2()) ? "医生判定阳性" : ""); + map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : ""); + map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : ""); // CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map);