diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java new file mode 100644 index 0000000..7d91164 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java @@ -0,0 +1,58 @@ +package com.lyms.platform.common.enums; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author dongqin + * @Description 儿保眼科检查建议下拉 + * @Date 16:17 2019/5/22 + */ + +public enum EyeExaminationEnums { + YGY(1,"建议1个月复查"), + NGY(2,"建议2个月复查"), + SGY(3,"建议3个月复查"), + LGY(4,"建议6个月复查"), + JYB(5,"建议进一步检查"), + PHJC(9,"配合检查"); + + private EyeExaminationEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(EyeExaminationEnums eye : values()){ + if(id==eye.id){ + return eye.getName(); + } + } + return ""; + } + + public static List getEyeExaminationEnums() { + List list = new ArrayList<>(); + for (ExpYunEnums e : ExpYunEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + + private int id; + + private String name; + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index c1501f8..ce7ee06 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -389,6 +389,72 @@ public class BabyCheckModel extends BaseModel { // 纠正月龄||纠正胎龄 private String correctAge; + /***增加眼科检查项***/ + + /** + * 眼外观 + */ + private String eyeAppearance; + /** + * 红光反射 + */ + private String eyeRedReflex; + /** + * 屈光检查 + */ + private String eyeDioptroscopy; + /** + * 眼科建议 参见 EyeExaminationEnums + */ + private String eyeAdvice; + + /** + * 眼科指导建议 + */ + private String eyeGuideSuggestions; + + /***增加眼科检查项***/ + + public String getEyeAppearance() { + return eyeAppearance; + } + + public void setEyeAppearance(String eyeAppearance) { + this.eyeAppearance = eyeAppearance; + } + + public String getEyeRedReflex() { + return eyeRedReflex; + } + + public void setEyeRedReflex(String eyeRedReflex) { + this.eyeRedReflex = eyeRedReflex; + } + + public String getEyeDioptroscopy() { + return eyeDioptroscopy; + } + + public void setEyeDioptroscopy(String eyeDioptroscopy) { + this.eyeDioptroscopy = eyeDioptroscopy; + } + + public String getEyeAdvice() { + return eyeAdvice; + } + + public void setEyeAdvice(String eyeAdvice) { + this.eyeAdvice = eyeAdvice; + } + + public String getEyeGuideSuggestions() { + return eyeGuideSuggestions; + } + + public void setEyeGuideSuggestions(String eyeGuideSuggestions) { + this.eyeGuideSuggestions = eyeGuideSuggestions; + } + public String getDbDayNum() { return dbDayNum; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 22f5ea0..59f0d83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -396,6 +396,28 @@ public class BabyCheckFacade { model.setBabyCheckOther(request.getBabyCheckOther()); model.setAssistCheckOther(request.getAssistCheckOther()); model.setNavel(request.getNavel()); + + String value = request.getEyeAppearance(); + value = StringUtils.isNotEmpty(value) ? value : ""; + model.setEyeAppearance(value); + + value = request.getEyeRedReflex(); + value = StringUtils.isNotEmpty(value) ? value : ""; + model.setEyeRedReflex(value); + + value = request.getEyeDioptroscopy(); + value = StringUtils.isNotEmpty(value) ? value : ""; + model.setEyeDioptroscopy(value); + + value = request.getEyeAdvice(); + value = StringUtils.isNotEmpty(value) ? value : ""; + model.setEyeAdvice(value); + + value = request.getEyeGuideSuggestions(); + value = StringUtils.isNotEmpty(value) ? value : ""; + model.setEyeGuideSuggestions(value); + + //新加字段 return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 3004948..af17f8b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -362,6 +362,74 @@ public class BabyCheckRequest { private Date endCaseTime; + /***增加眼科检查项***/ + + /** + * 眼外观 + */ + private String eyeAppearance; + /** + * 红光反射 + */ + private String eyeRedReflex; + /** + * 屈光检查 + */ + private String eyeDioptroscopy; + /** + * 眼科建议 参见 EyeExaminationEnums + */ + private String eyeAdvice; + + /** + * 眼科指导建议 + */ + private String eyeGuideSuggestions; + + public String getEyeAppearance() { + return eyeAppearance; + } + + public void setEyeAppearance(String eyeAppearance) { + this.eyeAppearance = eyeAppearance; + } + + public String getEyeRedReflex() { + return eyeRedReflex; + } + + public void setEyeRedReflex(String eyeRedReflex) { + this.eyeRedReflex = eyeRedReflex; + } + + public String getEyeDioptroscopy() { + return eyeDioptroscopy; + } + + public void setEyeDioptroscopy(String eyeDioptroscopy) { + this.eyeDioptroscopy = eyeDioptroscopy; + } + + public String getEyeAdvice() { + return eyeAdvice; + } + + public void setEyeAdvice(String eyeAdvice) { + this.eyeAdvice = eyeAdvice; + } + + public String getEyeGuideSuggestions() { + return eyeGuideSuggestions; + } + + public void setEyeGuideSuggestions(String eyeGuideSuggestions) { + this.eyeGuideSuggestions = eyeGuideSuggestions; + } + + /***增加眼科检查项***/ + + + public Date getEndCaseTime() { return endCaseTime; }