From d6b8dfa19ecc12b5d6a3ccba693f0ec90877499f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 14 Feb 2017 17:45:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index ff3eeb5..085bf51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -270,7 +270,7 @@ public class ViewFacade { //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime())); //产检孕周 - map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients)); + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime())); String checkDoctor = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){ @@ -601,7 +601,7 @@ public class ViewFacade { //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate())); - map.put("currentDueDate",checkWeek(patients)); + map.put("currentDueDate",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); String checkDoctor = ""; -- 1.8.3.1