diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 6a702ca..961c15e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -26,6 +26,8 @@ public class ReferralApplyOrderModel { private String phone; //生日 private Date birth; + //申请孕周、申请月龄 + private String dueWeek; //身份证号 private String cardNo; @@ -65,6 +67,14 @@ public class ReferralApplyOrderModel { //转诊类型 1 儿童 2 孕妇 private Integer type; + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + public Integer getSex() { return sex; } 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 b6cf09d..6ec443d 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,8 @@ public class ApplyOrderFacade { referralApplyOrderModel.setName(patients.getUsername()); referralApplyOrderModel.setPhone(patients.getPhone()); referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); + int days= DateUtil.daysBetween(new Date(),patients.getDueDate());; + referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); } } else { BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); @@ -102,6 +104,7 @@ public class ApplyOrderFacade { if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); } + referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()))); Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); referralApplyOrderModel.setParentId(babyModel.getId()); referralApplyOrderModel.setMname(patients.getUsername()); 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 0c7a36b..8e1b65c 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 @@ -23,14 +23,17 @@ public class ApplyOrderOutResult { private Integer age; //转入医院 private String transferredHospital; - //孕周 + //申请孕周 private String dueWeek; + //当前孕周 + private String cDueWeek; //预产期 private String dueDate; //高危等级 private String rLevel; //风险因素 private String rRisk; + private Integer score=0; //病情描述 private String diseaseDesc; @@ -56,6 +59,17 @@ public class ApplyOrderOutResult { //转入医院 private String zhuanRname; + public String getcDueWeek() { + if(null==cDueWeek){ + return SPIT; + } + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + public String getZhuanCName() { return zhuanCName; } @@ -279,8 +293,9 @@ public class ApplyOrderOutResult { setrLevel(destModel.getrLevel()); if(null!=destModel.getDueDate()){ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); - this.dueWeek= StringUtils.dueWeek(days); + this.cDueWeek= StringUtils.dueWeek(days); } + setDueWeek(destModel.getDueWeek()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java index 0a06a55..832bc5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java @@ -22,8 +22,11 @@ public class BabyApplyOrderResult { private String hRisk; //性别 private String sex; - //月龄 + //申请月龄 private String yl; + + //当前月龄 + private String cyl; //生日 private String birth; //母亲姓名 @@ -51,6 +54,14 @@ public class BabyApplyOrderResult { private String zhuanRname; private String status; + public String getCyl() { + return cyl; + } + + public void setCyl(String cyl) { + this.cyl = cyl; + } + public String getStatus() { return status; } @@ -98,9 +109,9 @@ public class BabyApplyOrderResult { } if(null!=referralApplyOrderModel.getBirth()){ setBirth(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getBirth())); - - setYl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date()))); + setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date()))); } + setYl(referralApplyOrderModel.getDueWeek()); if (null != referralApplyOrderModel.getCreated()) { setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated())); }