Commit f330b0303f25a3c9afc23cdda40640c1593b021f
1 parent
cb6425fd95
Exists in
master
and in
6 other branches
查询号bug修改
Showing 1 changed file with 7 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
f330b03
| ... | ... | @@ -361,7 +361,10 @@ |
| 361 | 361 | if (CollectionUtils.isNotEmpty(orderModels)) { |
| 362 | 362 | boolean isZhuan = false; |
| 363 | 363 | for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 |
| 364 | - if (raom.getCreated().before(data.getCheckDate())) { | |
| 364 | + String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckDate()); | |
| 365 | + String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); | |
| 366 | + | |
| 367 | + if (raom.getCreated().before(data.getCheckDate())||checkTime.equals(Created)) { | |
| 365 | 368 | isZhuan = true; |
| 366 | 369 | continue; |
| 367 | 370 | } |
| ... | ... | @@ -1005,7 +1008,6 @@ |
| 1005 | 1008 | } |
| 1006 | 1009 | } |
| 1007 | 1010 | if (StringUtils.isNotEmpty(data.getbChao())) |
| 1008 | - | |
| 1009 | 1011 | { |
| 1010 | 1012 | map.put("bChao", data.getbChao()); |
| 1011 | 1013 | } |
| ... | ... | @@ -1019,7 +1021,9 @@ |
| 1019 | 1021 | if (CollectionUtils.isNotEmpty(orderModels)) { |
| 1020 | 1022 | boolean isZhuan = false; |
| 1021 | 1023 | for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 |
| 1022 | - if (raom.getCreated().before(data.getCheckTime())) { | |
| 1024 | + String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckTime()); | |
| 1025 | + String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); | |
| 1026 | + if (raom.getCreated().before(data.getCheckTime())||checkTime.equals(Created)) { | |
| 1023 | 1027 | isZhuan = true; |
| 1024 | 1028 | continue; |
| 1025 | 1029 | } |