Commit 9753c2b5ce32409de6070bd1bebf0c455e4b37d9
1 parent
2fe9db3fd2
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 9 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
9753c2b
| ... | ... | @@ -24,6 +24,7 @@ |
| 24 | 24 | import com.lyms.platform.pojo.*; |
| 25 | 25 | import com.lyms.platform.query.*; |
| 26 | 26 | import org.apache.commons.collections.CollectionUtils; |
| 27 | +import org.apache.commons.lang.math.*; | |
| 27 | 28 | import org.springframework.beans.factory.annotation.Autowired; |
| 28 | 29 | import org.springframework.data.domain.Sort; |
| 29 | 30 | import org.springframework.stereotype.Component; |
| ... | ... | @@ -991,10 +992,14 @@ |
| 991 | 992 | |
| 992 | 993 | if (StringUtils.isNotEmpty(model.getDeliverOrg())) |
| 993 | 994 | { |
| 994 | - Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); | |
| 995 | - if (org != null) | |
| 996 | - { | |
| 997 | - result.setDeliverOrg(org.getName()); | |
| 995 | + if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){ | |
| 996 | + Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); | |
| 997 | + if (org != null) | |
| 998 | + { | |
| 999 | + result.setDeliverOrg(org.getName()); | |
| 1000 | + } | |
| 1001 | + }else { | |
| 1002 | + result.setDeliverOrg(model.getDeliverOrg()); | |
| 998 | 1003 | } |
| 999 | 1004 | } |
| 1000 | 1005 |