From f180a51fd878687d0f3ef94d545fe4f5e6d7036e Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 1 Dec 2016 15:13:06 +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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 9b8b14b..fe56316 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(), patients.getType())); + predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus())); predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel); } } @@ -149,9 +149,15 @@ public class PredictedStatisticsFacade { } - private static String getGestationalWeeks(Date date, int type) { + private static String getGestationalWeeks(Date date, int type, int dueStatus) { if (type == 3) { - return "已分娩"; + if (dueStatus == 0) { + return "已分娩"; + } else if (dueStatus == 1) { + return "终止妊娠"; + } else { + return ""; + } } try { String str = "孕"; -- 1.8.3.1