Commit 47f9b719e181eb1f32ab6fa76bccb5b5b7f426cc
1 parent
0fb7368c35
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
View file @
47f9b71
| ... | ... | @@ -1197,8 +1197,10 @@ |
| 1197 | 1197 | * 前端算出来的月龄model.getMonthAge()直接拿, |
| 1198 | 1198 | * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算 |
| 1199 | 1199 | */ |
| 1200 | - if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){ | |
| 1201 | - month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1200 | + if("216".equals(hospitalId)){ | |
| 1201 | + if(!model.getMonthAge().contains("孕")){ | |
| 1202 | + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1203 | + } | |
| 1202 | 1204 | } |
| 1203 | 1205 | model.setBirth(babyModel.getBirth()); |
| 1204 | 1206 | model.setCardNo(babyModel.getCardNo()); |
| ... | ... | @@ -1232,8 +1234,10 @@ |
| 1232 | 1234 | * 前端算出来的月龄model.getMonthAge()直接拿, |
| 1233 | 1235 | * model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算 |
| 1234 | 1236 | */ |
| 1235 | - if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){ | |
| 1236 | - month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1237 | + if("216".equals(hospitalId)){ | |
| 1238 | + if(!model.getMonthAge().contains("孕")){ | |
| 1239 | + month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月"))); | |
| 1240 | + } | |
| 1237 | 1241 | } |
| 1238 | 1242 | model.setCreateUser(null); |
| 1239 | 1243 | model.setCreateTime(null); |