shiyang / regional-platform

Download as
Browse Code »

Commit f180a51fd878687d0f3ef94d545fe4f5e6d7036e

Authored by hujiaqi
1 parent fcad4196e5
Exists in master and in 1 other branch nobuildprocess

产妇修改为分娩状态

Showing 1 changed file with 9 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ f180a51
... ... @@ -93,7 +93,7 @@
93 93 predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList));
94 94 predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId()));
95 95 predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId()));
96   - predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType()));
  96 + predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
97 97 predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel);
98 98 }
99 99 }
100 100  
... ... @@ -149,9 +149,15 @@
149 149  
150 150 }
151 151  
152   - private static String getGestationalWeeks(Date date, int type) {
  152 + private static String getGestationalWeeks(Date date, int type, int dueStatus) {
153 153 if (type == 3) {
154   - return "已分娩";
  154 + if (dueStatus == 0) {
  155 + return "已分娩";
  156 + } else if (dueStatus == 1) {
  157 + return "终止妊娠";
  158 + } else {
  159 + return "";
  160 + }
155 161 }
156 162 try {
157 163 String str = "孕";