diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 9ec7bc6..9849b93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -79,8 +79,8 @@ public class MatDeliverListResult { if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } - if(null!=patients.getBuildType()){ - dueType=0==patients.getBuildType()?"0":"1"; + if (null != patients.getBuildType()) { + dueType = 0 == patients.getBuildType() ? "0" : "1"; } setName(patients.getUsername()); setPhone(patients.getPhone()); @@ -89,11 +89,18 @@ public class MatDeliverListResult { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); String week = (days / 7) + ""; int day = (days % 7); - this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + + if (patients.getDueStatus() == 1) { + this.dueWeek = "终止妊娠"; + } else if (null != patients.getFmDate()) { + dueWeek = "已分娩"; + } else { + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } if (CollectionUtils.isNotEmpty(destList)) { List list = new ArrayList<>(); for (MaternalDeliverModel model : destList) { - list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType(),patients.getFmDate())); + list.add(new MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate())); } setData(list); } @@ -194,7 +201,8 @@ public class MatDeliverListResult { //分娩时间,补录时使用 private String dueDate; - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType,Date dueDate) { + + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime, Integer buildType, Date dueDate) { setCheckTime(deliverModel.getDueDate()); setId(deliverModel.getId()); setHospitalId(deliverModel.getHospitalId()); @@ -204,8 +212,8 @@ public class MatDeliverListResult { setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); } - if(null!=dueDate){ - this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); + if (null != dueDate) { + this.dueDate = DateUtil.getyyyy_MM_dd(dueDate); } }