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 eedafdb..91b3cd5 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 @@ -211,6 +211,7 @@ public class BabyCheckModel extends BaseModel { private String hospitalId; //体重评价 private String weightEvaluate; + private String weightEvaluateStandard; //身长评价 private String heightEvaluate; //头围评价 @@ -220,8 +221,7 @@ public class BabyCheckModel extends BaseModel { private String heightEvaluateStandard; //头围评价标准值 private String headEvaluateStandard; - //胸围标准值 - private String chestwStandard; + private Date birth; //检查月龄 @@ -1717,12 +1717,12 @@ public class BabyCheckModel extends BaseModel { this.headEvaluateStandard = headEvaluateStandard; } - public String getChestwStandard() { - return chestwStandard; + public String getWeightEvaluateStandard() { + return weightEvaluateStandard; } - public void setChestwStandard(String chestwStandard) { - this.chestwStandard = chestwStandard; + public void setWeightEvaluateStandard(String weightEvaluateStandard) { + this.weightEvaluateStandard = weightEvaluateStandard; } public void setPortaGenitals(String portaGenitals) { 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 3989f5f..8c637b3 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 @@ -219,7 +219,7 @@ public class BabyCheckFacade extends BaseServiceImpl { BabyCheckModel model = new BabyCheckModel(); model.setHeightEvaluateStandard(request.getHeightEvaluateStandard()); model.setHeadEvaluateStandard(request.getHeadEvaluateStandard()); - model.setChestwStandard(request.getChestwStandard()); + model.setWeightEvaluateStandard(request.getWeightEvaluateStandard()); //结案 /*model.setEndCase(request.getEndCase()); 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 6d3d289..73b990c 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 @@ -80,6 +80,7 @@ public class BabyCheckRequest { private String head; //体重评价 private String weightEvaluate; + private String weightEvaluateStandard; //身长评价 private String heightEvaluate; private String heightEvaluateStandard; @@ -88,7 +89,6 @@ public class BabyCheckRequest { private String headEvaluateStandard; //胸围 private String chestw; - private String chestwStandard; //身长别体重 private String heightWeight; @@ -327,11 +327,11 @@ public class BabyCheckRequest { //其它诊断 private List otherDiagnose; //处理意见 - private String handlSuggest; - //指导意见 private String guideSuggest; //产检医生 @FormParam + private String handlSuggest; + //指导意见 @NotEmpty(message = "检查医生不能为空") private String checkDoctor; //下次预约时间 @@ -456,13 +456,7 @@ public class BabyCheckRequest { this.headEvaluateStandard = headEvaluateStandard; } - public String getChestwStandard() { - return chestwStandard; - } - public void setChestwStandard(String chestwStandard) { - this.chestwStandard = chestwStandard; - } public List getOtherDiagnose() { return otherDiagnose; @@ -1392,6 +1386,14 @@ public class BabyCheckRequest { return couponCode; } + public String getWeightEvaluateStandard() { + return weightEvaluateStandard; + } + + public void setWeightEvaluateStandard(String weightEvaluateStandard) { + this.weightEvaluateStandard = weightEvaluateStandard; + } + public void setCouponCode(String couponCode) { this.couponCode = couponCode; }