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 c0a95cf..3e7470c 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 @@ -883,6 +883,7 @@ public class BabyCheckFacade { base.setCardNo(model.getMcertNo()); base.setPregnantCertificateTypeId(model.getMcertTypeId()); base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + base.setMonth(DateUtil.getMonth(model.getBirth(), new Date())); //计算儿童的预产期 if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿,根据出生孕周计算末次月经,在根据末次月经计算预产期 String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth()); 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 b31a39c..e92a6ca 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 @@ -25,6 +25,9 @@ public class BabyBasicResult { private String name; //儿童月龄 private String monthAge; + //不转换的月龄 + private Integer month; + //检查日期 private String checkDate; //诊断 @@ -77,6 +80,14 @@ public class BabyBasicResult { */ private List serviceList; + public Integer getMonth() { + return month; + } + + public void setMonth(Integer month) { + this.month = month; + } + public String getEndCase() { return endCase; }