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 04ca4f3..89fff7e 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 @@ -24,7 +24,8 @@ public class BabyCheckModel extends BaseModel { //儿保检查时间 private Date checkDate; - + //月龄下拉框 + private String ylSelect; @@ -252,6 +253,14 @@ public class BabyCheckModel extends BaseModel { this.created = created; } + public String getYlSelect() { + return ylSelect; + } + + public void setYlSelect(String ylSelect) { + this.ylSelect = ylSelect; + } + /******诊断指导****/ public String getId() { 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 c237cbd..5454da3 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 @@ -80,7 +80,7 @@ public class BabyCheckFacade { model.setYn(YnEnums.YES.getId()); model.setBuildId(request.getBuildId()); - + model.setYlSelect(request.getYlSelect()); model.setMainFoster(request.getMainFoster()); model.setFeedType(request.getFeedType()); model.setPee(request.getPee()); @@ -256,6 +256,7 @@ public class BabyCheckFacade { base.setId(id); base.setSex(model.getSex()); base.setName(model.getName()); + base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); if (model.getDiagnose() != null) @@ -295,7 +296,8 @@ public class BabyCheckFacade { Patients patients = null; if (CollectionUtils.isNotEmpty(list)) { patients = list.get(0); - + base.setCardNo(patients.getCardNo()); + base.setVcCardNo(patients.getVcCardNo()); AntExChuQuery antExChuQuery=new AntExChuQuery(); antExChuQuery.setParentId(patients.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -429,7 +431,7 @@ public class BabyCheckFacade { model.setId(checkModel.getId()); model.setBuildId(checkModel.getBuildId()); - + model.setYlSelect(checkModel.getYlSelect()); model.setMainFoster(checkModel.getMainFoster()); model.setFeedType(checkModel.getFeedType()); model.setPee(checkModel.getPee()); 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 3456cf6..b83e322 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 @@ -75,8 +75,16 @@ public class BabyCheckRequest { //身长别体重 private String heightWeight; + //月龄下拉框 + private String ylSelect; + public String getYlSelect() { + return ylSelect; + } + public void setYlSelect(String ylSelect) { + this.ylSelect = ylSelect; + } //发育评价 private String growthEvaluate; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index 00f7720..be563d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -28,6 +28,26 @@ public class BabyBasicResult { private String mremark; //性别 private Integer sex; + //母亲的就诊卡号 + private String vcCardNo; + //母亲身份证号 + private String cardNo; + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } public String getId() { return id; 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 8688770..7e69fa3 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 @@ -46,7 +46,15 @@ public class BabyCheckResult { //药物过敏史 private Map drugGllergic; + private String ylSelect; + public String getYlSelect() { + return ylSelect; + } + + public void setYlSelect(String ylSelect) { + this.ylSelect = ylSelect; + } /******问诊情况****/