diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
index d965236..6dd370b 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
@@ -377,16 +377,18 @@ public class DoctorController {
             if(null!=dpid){
                 wrapper.eq(LymsDoctor::getDpid,dpid);
             }
-            if(null!=dlogin){
+            if(StringUtil.isNotEmpty(dlogin)){
                 wrapper.eq(LymsDoctor::getDlogin,dlogin);
             }
             List<LymsDoctor> list = lymsDoctorService.list(wrapper);
             for (LymsDoctor lymsDoctor : list) {
                 Map<String, Object> visitRateMap = getReturn(lymsDoctor.getDlogin(), startTime, endTime);
+                LymsHdepart hdepart = lymsHdepartService.getById(lymsDoctor.getDpid());
                 visitRateMap.put("hid", lymsDoctor.getHid());
-                visitRateMap.put("hname", lymsDoctor.getHname());
+                visitRateMap.put("hname", hdepart.getHname());
                 visitRateMap.put("dpid", lymsDoctor.getDpid());
-                visitRateMap.put("ddname", lymsDoctor.getDdname());
+                visitRateMap.put("ddname", hdepart.getDname());
+                visitRateMap.put("dname", lymsDoctor.getDname());
                 result.add(visitRateMap);
             }
             baseResponse.setObject(result);