From 342b5c1f3f888706825b426ff66ea34dd50e9f30 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 09:36:14 +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 --- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 4 ++-- .../platform/operate/web/request/RiskPatientsQueryRequest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 9950f8a..e09dd1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -206,8 +206,8 @@ public class PatientFacade { patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType())); } patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); - patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart()); - patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd()); + patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd()); + patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart()); if(null!= riskPatientsQueryRequest.getStartAge()){ Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 7cda15f..96a04f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -61,8 +61,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { public Date capStart() { if (null != startDueWeek) { - start = NumberUtils.toInt(startDueWeek, 0); - Date endDate = DateUtil.addDay(new Date(), -(start*7)); + int start = NumberUtils.toInt(startDueWeek, 0); + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7)+6); return endDate; } return null; @@ -70,8 +70,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { public Date capEnd() { if (null != endDueWeek) { - end = NumberUtils.toInt(endDueWeek, 0); - Date endDate = DateUtil.addDay(new Date(), -(end*7)); + int end = NumberUtils.toInt(endDueWeek, 0); + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)); return endDate; } return null; -- 1.8.3.1