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 231dfdd..dccfe05 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 @@ -1983,6 +1983,10 @@ public class BabyCheckFacade extends BaseServiceImpl { result.setHighRisk(model.getHighRisk()); result.setWeakSon(model.getWeakSon()); result.setBabyDiagnosis(model.getBabyDiagnosis()); + //预产期 + result.setDueDate(model.getDueDate()); + //分娩孕周 + result.setDueWeek(model.getDueWeek()); //秦皇岛-高危儿详情 result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null); List list = new ArrayList <>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java index ba1e1f2..5fe6163 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import java.util.Date; import java.util.List; import java.util.Map; @@ -19,6 +20,8 @@ public class BabyChooseResult { private String blNo; private List highRiskInfo;//儿童高危详情 private List weakSonInfo;//体弱儿详情 + private Date dueDate;//预产期 + private Integer dueWeek;//分娩孕周 //是否高危 0 非高危 1高危 private Integer highRisk; @@ -52,8 +55,26 @@ public class BabyChooseResult { public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { this.qhdHighRiskInfo = qhdHighRiskInfo; } + + public Date getDueDate() { + return dueDate; + } + + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + + public Integer getDueWeek() { + return dueWeek; + } + + public void setDueWeek(Integer dueWeek) { + this.dueWeek = dueWeek; + } + /***********************************************************/ + public String getBabyDiagnosis() { return babyDiagnosis; }