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 119ceb0..202eaf4 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 @@ -30,6 +30,8 @@ public class ReferralApplyOrderModel { private Date birth; //申请孕周、申请月龄(多少天) private Integer dueWeek; + //末次月经 + private Date lastMenses; //身份证号 private String cardNo; @@ -78,6 +80,14 @@ public class ReferralApplyOrderModel { private Integer serviceType; + public Date getLastMenses() { + return lastMenses; + } + + public void setLastMenses(Date lastMenses) { + this.lastMenses = lastMenses; + } + public String getRecDoctor() { return recDoctor; } 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 70d3268..f2bb197 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 @@ -119,6 +119,7 @@ public class ApplyOrderFacade { if(patients.getType()==1){ days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); } + referralApplyOrderModel.setLastMenses(patients.getLastMenses()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); referralApplyOrderModel.setrRisk(highScoreResult.getHighId()); referralApplyOrderModel.setScore(highScoreResult.getScore()); 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 f6ff3b1..acd2bc5 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 @@ -326,25 +326,23 @@ public class ApplyOrderOutResult { setId(destModel.getId()); setName(destModel.getName()); setScore(destModel.getScore()); - if(null!=destModel.getDueDate()){ - int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); + if(null!=destModel.getDueWeek()){ if(-1==destModel.getDueWeek()){ setDueWeek("已分娩"); setIsGravida("0"); }else{ - setDueWeek(StringUtils.dueWeek(days)); + setDueWeek(StringUtils.dueWeek(destModel.getDueWeek())); setIsGravida("1"); } - } setPid(destModel.getPid()); - if(null!=destModel.getDueWeek()) { + if(null!=destModel.getLastMenses()) { if (-1 == destModel.getDueWeek()){ setcDueWeek("已分娩"); setIsGravida("0"); }else{ - setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); + setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(destModel.getLastMenses(), new Date()))); setIsGravida("1"); } }