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 ""; } }