diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 3a7118a..83c92c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1962,6 +1962,14 @@ public class PatientServiceFacade { for (Patients patients:list){ BirthResult birthResult=new BirthResult(); BeanUtils.copy(patients, birthResult); + String dueWeek = ""; + if (patients.getFmWeek()!=null){ + String week = (patients.getFmWeek() / 7) + ""; + int day = (patients.getFmWeek() % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + birthResult.setDueWeek(dueWeek); + birthResult.setParentId(patients.getId()); babyQuery.setParentId(patients.getId()); List babyModels= babyService.queryBabyWithQuery(babyQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java index d44d7b3..fd623c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java @@ -1,12 +1,18 @@ package com.lyms.platform.operate.web.result; +import java.util.Date; + public class BirthResult { private String parentId; private String pId; private String username; private String vcCardNo; private String cardNo; + private String phone; + // 分娩孕周 + private String dueWeek; + private Date fmDate; /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 @@ -91,6 +97,30 @@ public class BirthResult { return babyId; } + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public Date getFmDate() { + return fmDate; + } + + public void setFmDate(Date fmDate) { + this.fmDate = fmDate; + } + public void setBabyId(String babyId) { this.babyId = babyId; }