From aa9bd207984d27bfe0275b4b7245e106d50aa0bf Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 1 Dec 2016 15:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E5=A8=A9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PredictedStatisticsFacade.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 847e128..9b8b14b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -93,7 +93,7 @@ public class PredictedStatisticsFacade { predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList)); predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())); predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); - predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses())); + predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType())); predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel); } } @@ -149,21 +149,24 @@ public class PredictedStatisticsFacade { } - private static String getGestationalWeeks(Date date) { - String str = ""; + private static String getGestationalWeeks(Date date, int type) { + if (type == 3) { + return "已分娩"; + } try { + String str = "孕"; long s = new Date().getTime() - date.getTime(); long d = s / (60 * 60 * 24 * 1000); int day = (int) d; int w = day / 7; int dd = day % 7; - str += "孕" + w + "周"; + str += w + "周"; if (dd != 0) { str += "+" + dd + "天"; } return str; } catch (Exception e) { - return str; + return ""; } } -- 1.8.3.1