From 36b71b97f250b36340f41f559186fb32f6dfd6c1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 29 Aug 2016 15:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 13 ++++--------- .../platform/operate/web/result/ApplyOrderOutResult.java | 8 ++++++-- 2 files changed, 10 insertions(+), 11 deletions(-) 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 8df73d4..71c5757 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 @@ -115,7 +115,10 @@ public class ApplyOrderFacade { referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); referralApplyOrderModel.setBirth(patients.getBirth()); referralApplyOrderModel.setExpVip(patients.getExpVip()); - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + int days=-1; + if(patients.getType()==1){ + days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + } HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); referralApplyOrderModel.setrRisk(highScoreResult.getHighId()); referralApplyOrderModel.setScore(highScoreResult.getScore()); @@ -387,14 +390,6 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); referralApplyOrderQuery.setNeed("1"); - /* if(null!=applyOrderQueryRequest.getStartScore()){ - referralApplyOrderQuery.setScoreStart(applyOrderQueryRequest.getStartScore()); - } - - if(null!=applyOrderQueryRequest.getEndScore()){ - referralApplyOrderQuery.setScoreEnd(applyOrderQueryRequest.getEndScore()); - }*/ - List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { 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 03fb0a3..22b4307 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 @@ -314,10 +314,14 @@ public class ApplyOrderOutResult { setId(destModel.getId()); setName(destModel.getName()); setScore(destModel.getScore()); -// setrLevel(destModel.getrLevel()); if(null!=destModel.getDueDate()){ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); - setDueWeek(StringUtils.dueWeek(days)); + if(-1==days){ + setDueWeek("已分娩"); + }else{ + setDueWeek(StringUtils.dueWeek(days)); + } + } setPid(destModel.getPid()); if(null!=destModel.getDueWeek()){ -- 1.8.3.1