diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 6ec443d..2e284e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -95,6 +95,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setName(patients.getUsername()); referralApplyOrderModel.setPhone(patients.getPhone()); referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); + referralApplyOrderModel.setBirth(patients.getBirth()); int days= DateUtil.daysBetween(new Date(),patients.getDueDate());; referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 6a5e293..6d88069 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -20,7 +20,7 @@ public class ApplyOrderOutResult { private String id; //名字 private String name; - private Integer age; + private String age; //转入医院 private String transferredHospital; //申请孕周 @@ -106,11 +106,15 @@ public class ApplyOrderOutResult { this.cardNo = cardNo; } - public Integer getAge() { + public String getAge() { + if(StringUtils.isEmpty(cardNo)){ + return SPIT; + } + return age; } - public void setAge(Integer age) { + public void setAge(String age) { this.age = age; } @@ -305,7 +309,12 @@ public class ApplyOrderOutResult { setPotentialRisk(destModel.getPotentialRisk()); setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus())); setTransferredHospital(destModel.getTransferredHospital()); - setAge(DateUtil.getAge(destModel.getBirth())); + if(null!=destModel.getBirth()){ + Integer age = DateUtil.getAge(destModel.getBirth()); + if(null!=age){ + setAge(age+""); + } + } setCardNo(destModel.getCardNo()); setPhone(destModel.getPhone()); return this;