Commit 9d7ba9c2c8285dc512992e7599a90e056cc846a5
1 parent
971127b0c7
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 5 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
View file @
9d7ba9c
| ... | ... | @@ -462,7 +462,7 @@ |
| 462 | 462 | |
| 463 | 463 | if (null != dueDateStart) { |
| 464 | 464 | if (null != c) { |
| 465 | - c = c.where("days").gte(dueDateStart); | |
| 465 | + c = c.and("days").gte(dueDateStart); | |
| 466 | 466 | } else { |
| 467 | 467 | c = Criteria.where("days").gte(dueDateStart); |
| 468 | 468 | } |
| ... | ... | @@ -491,7 +491,7 @@ |
| 491 | 491 | } |
| 492 | 492 | if (null != birthStart) { |
| 493 | 493 | if (null != c) { |
| 494 | - c = c.where("birth").gte(birthStart); | |
| 494 | + c = c.and("birth").gte(birthStart); | |
| 495 | 495 | } else { |
| 496 | 496 | c = Criteria.where("birth").gte(birthStart); |
| 497 | 497 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
9d7ba9c
| ... | ... | @@ -1272,13 +1272,13 @@ |
| 1272 | 1272 | map.put("applyDoctor", users.getName()); |
| 1273 | 1273 | map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated())); |
| 1274 | 1274 | String hospital1 = ""; |
| 1275 | - /*if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) { | |
| 1275 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) { | |
| 1276 | 1276 | Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital())); |
| 1277 | 1277 | if (organization != null && organization.getYn() == YnEnums.YES.getId()) { |
| 1278 | 1278 | hospital1 = organization.getName(); |
| 1279 | 1279 | } |
| 1280 | - }*/ | |
| 1281 | - map.put("zhuanRname", reOrderModel.getTransferredHospital()); | |
| 1280 | + } | |
| 1281 | + map.put("zhuanRname",hospital1); | |
| 1282 | 1282 | if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) { |
| 1283 | 1283 | Users users1 = usersService.getUsers(NumberUtils.toInt(reOrderModel.getRecDoctor())); |
| 1284 | 1284 | if (null != users) { |