diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 259e767..9a86b5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -182,39 +182,43 @@ public class AntexListResult { } public AntexListResult convertToResult(List destModel, Patients patients, List antExChuModel) { - setId(patients.getId()); - try { - if (null != patients.getBirth()) { - setAge(DateUtil.getAge(patients.getBirth())); - setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); + if(null!=patients){ + setId(patients.getId()); + try { + if (null != patients.getBirth()) { + setAge(DateUtil.getAge(patients.getBirth())); + setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); + } + + } catch (Exception e) { + } + if (null != patients.getDueDate()) { + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } + setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); + setName(patients.getUsername()); + setPhone(patients.getPhone()); + setRemarks(patients.getMremark()); + setCardNo(patients.getCardNo()); + + setVcCardNo(patients.getVcCardNo()); + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { + this.dueWeek = "终止妊娠"; + } else if (3 == patients.getType()) { + this.dueWeek = "已分娩"; + } else { + if (null != patients.getLastMenses()) { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + this.dueWeek = StringUtils.dueWeek(days); + } } - } catch (Exception e) { - } - if (null != patients.getDueDate()) { - setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); - } - setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); - setName(patients.getUsername()); - setPhone(patients.getPhone()); - setRemarks(patients.getMremark()); - setCardNo(patients.getCardNo()); - - setVcCardNo(patients.getVcCardNo()); - if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { - this.dueWeek = "终止妊娠"; - } else if (3 == patients.getType()) { - this.dueWeek = "已分娩"; - } else { if (null != patients.getLastMenses()) { - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - this.dueWeek = StringUtils.dueWeek(days); + setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } } - if (null != patients.getLastMenses()) { - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); - } + return this; }