diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java index ecea863..327a198 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java @@ -1,14 +1,12 @@ package com.lyms.platform.common.enums; /** - * 前囟 正常/膨隆/凹陷/其他 + * 前囟 闭合/未闭合 * Created by lt on 2017/7/18 0018 */ public enum BregmaticEnums { - NORMAL(1, "正常"), - BOMBE(2, "膨隆"), - SUNKEN(3, "凹陷"), - OTHER(4, "其他"); + NORMAL(1, "闭合"), + BOMBE(2, "未闭合"); private Integer id; private String name; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/VomitEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/VomitEnums.java new file mode 100644 index 0000000..cae648d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/VomitEnums.java @@ -0,0 +1,44 @@ +package com.lyms.platform.common.enums; + +/** + * 是否呕吐 + * Created by lt on 2017/7/18 0018 + */ +public enum VomitEnums { + YES(1, "是"), + NO(2, "否"); + + private Integer id; + private String name; + + public static VomitEnums get(Integer id) { + VomitEnums[] values = VomitEnums.values(); + for (VomitEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + VomitEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index dddce97..8ebbc87 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -54,7 +54,7 @@ public class NewbornVisit { private String height; // 是否呕吐 - private boolean vomit; + private String vomit; // 大便 private String shit; @@ -274,11 +274,11 @@ public class NewbornVisit { this.height = height; } - public boolean isVomit() { + public String isVomit() { return vomit; } - public void setVomit(boolean vomit) { + public void setVomit(String vomit) { this.vomit = vomit; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 1ecbb3f..50a99bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -61,8 +61,9 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit List> bregmatic = EnumUtil.toJson(BregmaticEnums.class); List> umbilicalCord = EnumUtil.toJson(UmbilicalCordEnums.class); List> nextVisitTime = EnumUtil.toJson(NextVisitTimeEnums.class); + List> vomit = EnumUtil.toJson(VomitEnums.class); return RespBuilder.buildSuccess("feedType", feedType, "skin", skin, "complexion", complexion - , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime); + , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime, "vomit", vomit); } @Override