Commit e9a4692b0260582548c6a2483ac5a658802fa96c

Authored by litao@lymsh.com
1 parent 8fe7216fc5
Exists in master and in 1 other branch dev

新生儿访视相关

Showing 4 changed files with 52 additions and 9 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java View file @ e9a4692
1 1 package com.lyms.platform.common.enums;
2 2  
3 3 /**
4   - * 前囟 正常/膨隆/凹陷/其他
  4 + * 前囟 闭合/未闭合
5 5 * Created by lt on 2017/7/18 0018
6 6 */
7 7 public enum BregmaticEnums {
8   - NORMAL(1, "正常"),
9   - BOMBE(2, "膨隆"),
10   - SUNKEN(3, "凹陷"),
11   - OTHER(4, "其他");
  8 + NORMAL(1, "闭合"),
  9 + BOMBE(2, "未闭合");
12 10  
13 11 private Integer id;
14 12 private String name;
platform-common/src/main/java/com/lyms/platform/common/enums/VomitEnums.java View file @ e9a4692
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + * 是否呕吐
  5 + * Created by lt on 2017/7/18 0018
  6 + */
  7 +public enum VomitEnums {
  8 + YES(1, "是"),
  9 + NO(2, "否");
  10 +
  11 + private Integer id;
  12 + private String name;
  13 +
  14 + public static VomitEnums get(Integer id) {
  15 + VomitEnums[] values = VomitEnums.values();
  16 + for (VomitEnums value : values) {
  17 + if (value.getId() == id) {
  18 + return value;
  19 + }
  20 + }
  21 + return null;
  22 + }
  23 +
  24 + VomitEnums(Integer id, String name){
  25 + this.id = id;
  26 + this.name = name;
  27 + }
  28 +
  29 + public Integer getId() {
  30 + return id;
  31 + }
  32 +
  33 + public void setId(Integer id) {
  34 + this.id = id;
  35 + }
  36 +
  37 + public String getName() {
  38 + return name;
  39 + }
  40 +
  41 + public void setName(String name) {
  42 + this.name = name;
  43 + }
  44 +}
platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java View file @ e9a4692
... ... @@ -54,7 +54,7 @@
54 54 private String height;
55 55  
56 56 // 是否呕吐
57   - private boolean vomit;
  57 + private String vomit;
58 58  
59 59 // 大便
60 60 private String shit;
61 61  
... ... @@ -274,11 +274,11 @@
274 274 this.height = height;
275 275 }
276 276  
277   - public boolean isVomit() {
  277 + public String isVomit() {
278 278 return vomit;
279 279 }
280 280  
281   - public void setVomit(boolean vomit) {
  281 + public void setVomit(String vomit) {
282 282 this.vomit = vomit;
283 283 }
284 284  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ e9a4692
... ... @@ -61,8 +61,9 @@
61 61 List<Map<String, Object>> bregmatic = EnumUtil.toJson(BregmaticEnums.class);
62 62 List<Map<String, Object>> umbilicalCord = EnumUtil.toJson(UmbilicalCordEnums.class);
63 63 List<Map<String, Object>> nextVisitTime = EnumUtil.toJson(NextVisitTimeEnums.class);
  64 + List<Map<String, Object>> vomit = EnumUtil.toJson(VomitEnums.class);
64 65 return RespBuilder.buildSuccess("feedType", feedType, "skin", skin, "complexion", complexion
65   - , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime);
  66 + , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime, "vomit", vomit);
66 67 }
67 68  
68 69 @Override