Commit 08828750acd758dfa681e4baf392112f2c8665a9
1 parent
2c9a864a16
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 5 additions and 3 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
View file @
0882875
| ... | ... | @@ -377,16 +377,18 @@ |
| 377 | 377 | if(null!=dpid){ |
| 378 | 378 | wrapper.eq(LymsDoctor::getDpid,dpid); |
| 379 | 379 | } |
| 380 | - if(null!=dlogin){ | |
| 380 | + if(StringUtil.isNotEmpty(dlogin)){ | |
| 381 | 381 | wrapper.eq(LymsDoctor::getDlogin,dlogin); |
| 382 | 382 | } |
| 383 | 383 | List<LymsDoctor> list = lymsDoctorService.list(wrapper); |
| 384 | 384 | for (LymsDoctor lymsDoctor : list) { |
| 385 | 385 | Map<String, Object> visitRateMap = getReturn(lymsDoctor.getDlogin(), startTime, endTime); |
| 386 | + LymsHdepart hdepart = lymsHdepartService.getById(lymsDoctor.getDpid()); | |
| 386 | 387 | visitRateMap.put("hid", lymsDoctor.getHid()); |
| 387 | - visitRateMap.put("hname", lymsDoctor.getHname()); | |
| 388 | + visitRateMap.put("hname", hdepart.getHname()); | |
| 388 | 389 | visitRateMap.put("dpid", lymsDoctor.getDpid()); |
| 389 | - visitRateMap.put("ddname", lymsDoctor.getDdname()); | |
| 390 | + visitRateMap.put("ddname", hdepart.getDname()); | |
| 391 | + visitRateMap.put("dname", lymsDoctor.getDname()); | |
| 390 | 392 | result.add(visitRateMap); |
| 391 | 393 | } |
| 392 | 394 | baseResponse.setObject(result); |