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 7981de9..0af9840 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 @@ -635,6 +635,37 @@ public class BabyCheckModel extends BaseModel { //出牙数状态 1:正常,2:异常 private Integer cyNumType; + //眼保健检查id + private String lhEyeCheckId; + //口腔健检查id + private String oralCheckId; + //入园体检检查id + private String babyKindergartenCheckId; + + public String getLhEyeCheckId() { + return lhEyeCheckId; + } + + public void setLhEyeCheckId(String lhEyeCheckId) { + this.lhEyeCheckId = lhEyeCheckId; + } + + public String getOralCheckId() { + return oralCheckId; + } + + public void setOralCheckId(String oralCheckId) { + this.oralCheckId = oralCheckId; + } + + public String getBabyKindergartenCheckId() { + return babyKindergartenCheckId; + } + + public void setBabyKindergartenCheckId(String babyKindergartenCheckId) { + this.babyKindergartenCheckId = babyKindergartenCheckId; + } + public Integer getCyNumType() { return cyNumType; } 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 657f396..d72fbdd 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 @@ -700,7 +700,10 @@ public class BabyCheckFacade extends BaseServiceImpl { if(null!=request.getCyNumType()){ model.setCyNumType(request.getCyNumType()); } - + //眼保健、口腔、入院体检 3个检查的id + model.setLhEyeCheckId(request.getLhEyeCheckId()); + model.setOralCheckId(request.getOralCheckId()); + model.setBabyKindergartenCheckId(request.getBabyKindergartenCheckId()); return model; } @@ -2644,6 +2647,10 @@ public class BabyCheckFacade extends BaseServiceImpl { if(null!=checkModel.getCyNumType()){ model.setCyNumType(checkModel.getCyNumType()); } + //眼保健、口腔、入院体检 3个检查的id + model.setLhEyeCheckId(checkModel.getLhEyeCheckId()); + model.setOralCheckId(checkModel.getOralCheckId()); + model.setBabyKindergartenCheckId(checkModel.getBabyKindergartenCheckId()); return model; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 7fef015..2c25a46 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6423,6 +6423,10 @@ public class ViewFacade { if(null!=checkModel.getCyNumType()){ model.setCyNumType(checkModel.getCyNumType()); } + //眼保健、口腔、入院体检 3个检查的id + model.setLhEyeCheckId(checkModel.getLhEyeCheckId()); + model.setOralCheckId(checkModel.getOralCheckId()); + model.setBabyKindergartenCheckId(checkModel.getBabyKindergartenCheckId()); 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 d4ad196..48829bb 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 @@ -595,6 +595,36 @@ public class BabyCheckRequest { //出牙数状态 1:正常,2:异常 private Integer cyNumType; + //眼保健检查id + private String lhEyeCheckId; + //口腔健检查id + private String oralCheckId; + //入园体检检查id + private String babyKindergartenCheckId; + + public String getLhEyeCheckId() { + return lhEyeCheckId; + } + + public void setLhEyeCheckId(String lhEyeCheckId) { + this.lhEyeCheckId = lhEyeCheckId; + } + + public String getOralCheckId() { + return oralCheckId; + } + + public void setOralCheckId(String oralCheckId) { + this.oralCheckId = oralCheckId; + } + + public String getBabyKindergartenCheckId() { + return babyKindergartenCheckId; + } + + public void setBabyKindergartenCheckId(String babyKindergartenCheckId) { + this.babyKindergartenCheckId = babyKindergartenCheckId; + } public Integer getCyNumType() { return cyNumType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 586c077..bfb2b2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -812,6 +812,36 @@ public class BabyCheckPageResult { //出牙数状态 1:正常,2:异常 private Integer cyNumType; + //眼保健检查id + private String lhEyeCheckId; + //口腔健检查id + private String oralCheckId; + //入园体检检查id + private String babyKindergartenCheckId; + + public String getLhEyeCheckId() { + return lhEyeCheckId; + } + + public void setLhEyeCheckId(String lhEyeCheckId) { + this.lhEyeCheckId = lhEyeCheckId; + } + + public String getOralCheckId() { + return oralCheckId; + } + + public void setOralCheckId(String oralCheckId) { + this.oralCheckId = oralCheckId; + } + + public String getBabyKindergartenCheckId() { + return babyKindergartenCheckId; + } + + public void setBabyKindergartenCheckId(String babyKindergartenCheckId) { + this.babyKindergartenCheckId = babyKindergartenCheckId; + } public Integer getCyNumType() { return cyNumType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index cf75b15..24e7baf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -835,6 +835,36 @@ public class BabyCheckResult { //出牙数状态 1:正常,2:异常 private Integer cyNumType; + //眼保健检查id + private String lhEyeCheckId; + //口腔健检查id + private String oralCheckId; + //入园体检检查id + private String babyKindergartenCheckId; + + public String getLhEyeCheckId() { + return lhEyeCheckId; + } + + public void setLhEyeCheckId(String lhEyeCheckId) { + this.lhEyeCheckId = lhEyeCheckId; + } + + public String getOralCheckId() { + return oralCheckId; + } + + public void setOralCheckId(String oralCheckId) { + this.oralCheckId = oralCheckId; + } + + public String getBabyKindergartenCheckId() { + return babyKindergartenCheckId; + } + + public void setBabyKindergartenCheckId(String babyKindergartenCheckId) { + this.babyKindergartenCheckId = babyKindergartenCheckId; + } public Integer getCyNumType() { return cyNumType; }