Commit 097a6749cacc4e9bede6fe428a0d1b91ab52708b
1 parent
3fc6d460cd
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 6 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
View file @
097a674
| ... | ... | @@ -121,7 +121,12 @@ |
| 121 | 121 | postReviewQuery.setYn(YnEnums.YES.getId()); |
| 122 | 122 | stopWatch.start("query postreview list"); |
| 123 | 123 | List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); |
| 124 | - | |
| 124 | + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { | |
| 125 | + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); | |
| 126 | + if (null != users) { | |
| 127 | + chanResult.setCheckDoctor(users.getName()); | |
| 128 | + } | |
| 129 | + } | |
| 125 | 130 | String nextCheckTime = ""; |
| 126 | 131 | if (CollectionUtils.isNotEmpty(withList)) { |
| 127 | 132 | chanResult.setcTimes(withList.size()); |
| ... | ... | @@ -137,12 +142,6 @@ |
| 137 | 142 | chanResult.setcHTimes(patients.getPostViewTimes()); |
| 138 | 143 | }else{ |
| 139 | 144 | chanResult.setcHTimes(withList.size()); |
| 140 | - } | |
| 141 | - } | |
| 142 | - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { | |
| 143 | - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); | |
| 144 | - if (null != users) { | |
| 145 | - chanResult.setCheckDoctor(users.getName()); | |
| 146 | 145 | } |
| 147 | 146 | } |
| 148 | 147 | }else{ |