Commit 5f93b192946320b4669387a66a7094ceb02bed70
1 parent
f0edc19af6
Exists in
master
and in
1 other branch
增加设置parentid
Showing 2 changed files with 9 additions and 6 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
View file @
5f93b19
| 1 | 1 | package com.lyms.platform.pojo; |
| 2 | 2 | |
| 3 | +import org.apache.commons.lang.math.NumberUtils; | |
| 3 | 4 | import org.springframework.data.mongodb.core.mapping.Document; |
| 4 | 5 | |
| 5 | 6 | import java.util.Date; |
| ... | ... | @@ -180,7 +181,9 @@ |
| 180 | 181 | } |
| 181 | 182 | setApgarScore(babyModel.getApgarScore()); |
| 182 | 183 | setBabyHealthy(babyModel.getBabyHealthy()); |
| 183 | - setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); | |
| 184 | + if(NumberUtils.isNumber(babyModel.getBabyWeight())){ | |
| 185 | + setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); | |
| 186 | + } | |
| 184 | 187 | setBabyHeight(babyModel.getBabyHeight()); |
| 185 | 188 | setDeformity(babyModel.getMalformation()); |
| 186 | 189 | setPregnancyOut(babyModel.getPregnancyOut()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
5f93b19
| ... | ... | @@ -50,11 +50,11 @@ |
| 50 | 50 | |
| 51 | 51 | private static Map<Integer,String> ONE_ENUMS= new HashMap<>(); |
| 52 | 52 | static { |
| 53 | - ONE_ENUMS.put(3,"三"); | |
| 54 | - ONE_ENUMS.put(4,"四"); | |
| 55 | - ONE_ENUMS.put(5,"五"); | |
| 56 | - ONE_ENUMS.put(6,"六"); | |
| 57 | - ONE_ENUMS.put(7,"七"); | |
| 53 | + ONE_ENUMS.put(2,"三"); | |
| 54 | + ONE_ENUMS.put(3,"四"); | |
| 55 | + ONE_ENUMS.put(4,"五"); | |
| 56 | + ONE_ENUMS.put(5,"六"); | |
| 57 | + ONE_ENUMS.put(6,"七"); | |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |