jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 83ff73c1bb86fd07ad84b382e237988756eb774a

Authored by Administrator
1 parent 7e1e2bc011
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

抚宁眼保健功能个性定制开发update

Showing 2 changed files with 11 additions and 9 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java View file @ 83ff73c
... ... @@ -10,8 +10,10 @@
10 10 INTERNAL_OBLIQUE(2, "内斜"),
11 11 EXTERNAL_OBLIQUE(3, "外斜"),
12 12 SUPERIOR_OBLIQUE_MUSCLE(4, "上斜肌肌麻痹"),
13   - OTHER(5, "其他");
  13 + OTHER(5, "其他"),
  14 + QHZ(6, "欠合作");
14 15  
  16 +
15 17 private Integer id;
16 18 private String name;
17 19  
18 20  
... ... @@ -25,13 +27,13 @@
25 27 return null;
26 28 }
27 29  
28   - EyePositionEnums(Integer id, String name){
  30 + EyePositionEnums(Integer id, String name) {
29 31 this.id = id;
30 32 this.name = name;
31 33 }
32 34  
33 35 public static String getName(String id) {
34   - if(StringUtils.isEmpty(id)) {
  36 + if (StringUtils.isEmpty(id)) {
35 37 return null;
36 38 }
37 39 int i = Integer.parseInt(id);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 83ff73c
... ... @@ -161,7 +161,7 @@
161 161 return RespBuilder.buildSuccess();
162 162 }
163 163 Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
164   - map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "");
  164 + map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : "");
165 165 map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus()));
166 166 map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
167 167 map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime()));
... ... @@ -254,11 +254,11 @@
254 254 map.put("corneal", parseYinYang(babyEyeCheck.getCorneal(), babyEyeCheck.getCornealOther()));
255 255 map.put("lacrimalApparatus", parseYinYang(babyEyeCheck.getLacrimalApparatus(), babyEyeCheck.getLacrimalApparatusOther()));
256 256 //一下都是医生选定阳性
257   - map.put("eyePosition2", babyEyeCheck.getEyePosition2());
258   - map.put("redLeft2", babyEyeCheck.getRedLeft2());
259   - map.put("vision2", babyEyeCheck.getVision2());
260   - map.put("y2", babyEyeCheck.getY2());
261   - map.put("refraction2", babyEyeCheck.getRefraction2());
  257 + map.put("eyePosition2", "yang".equals(babyEyeCheck.getEyePosition2()) ? "医生判定阳性" : "");
  258 + map.put("redLeft2", "yang".equals(babyEyeCheck.getRedLeft2()) ? "医生判定阳性" : "");
  259 + map.put("vision2", "yang".equals(babyEyeCheck.getVision2()) ? "医生判定阳性" : "");
  260 + map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : "");
  261 + map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : "");
262 262 //
263 263 CollectionUtils.removeNullValue(map);
264 264 return RespBuilder.buildSuccess(map);