Commit 51b273d895be06a3e0dab8f5ca294079be0a306e
1 parent
58735dc1b5
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 15 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
51b273d
| ... | ... | @@ -42,6 +42,7 @@ |
| 42 | 42 | import java.io.*; |
| 43 | 43 | import java.text.SimpleDateFormat; |
| 44 | 44 | import java.util.*; |
| 45 | +import java.util.regex.Pattern; | |
| 45 | 46 | |
| 46 | 47 | /** |
| 47 | 48 | * 申请单门面 |
| 48 | 49 | |
| ... | ... | @@ -1272,13 +1273,18 @@ |
| 1272 | 1273 | map.put("applyDoctor", users.getName()); |
| 1273 | 1274 | map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated())); |
| 1274 | 1275 | String hospital1 = ""; |
| 1275 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) { | |
| 1276 | - Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital())); | |
| 1277 | - if (organization != null && organization.getYn() == YnEnums.YES.getId()) { | |
| 1278 | - hospital1 = organization.getName(); | |
| 1276 | + | |
| 1277 | + if(!isNumeric(reOrderModel.getTransferredHospital())){ | |
| 1278 | + map.put("zhuanRname",reOrderModel.getTransferredHospital()); | |
| 1279 | + }else{ | |
| 1280 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) { | |
| 1281 | + Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital())); | |
| 1282 | + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { | |
| 1283 | + hospital1 = organization.getName(); | |
| 1284 | + } | |
| 1285 | + map.put("zhuanRname",hospital1); | |
| 1279 | 1286 | } |
| 1280 | 1287 | } |
| 1281 | - map.put("zhuanRname",hospital1); | |
| 1282 | 1288 | if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) { |
| 1283 | 1289 | Users users1 = usersService.getUsers(NumberUtils.toInt(reOrderModel.getRecDoctor())); |
| 1284 | 1290 | if (null != users) { |
| ... | ... | @@ -1294,7 +1300,10 @@ |
| 1294 | 1300 | return null; |
| 1295 | 1301 | } |
| 1296 | 1302 | |
| 1297 | - | |
| 1303 | + public static boolean isNumeric(String str){ | |
| 1304 | + Pattern pattern = Pattern.compile("[0-9]*"); | |
| 1305 | + return pattern.matcher(str).matches(); | |
| 1306 | + } | |
| 1298 | 1307 | public BaseResponse getEnums() { |
| 1299 | 1308 | Map<String, Object> map = new HashMap<>(); |
| 1300 | 1309 | map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); |