diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorWorktimeController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorWorktimeController.java
index b8e6b75..265e9e1 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorWorktimeController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorWorktimeController.java
@@ -49,11 +49,20 @@ public class DoctorWorktimeController {
         if(StringUtil.isEmpty(doctorWorkTime.getStartTime()) || StringUtil.isEmpty(doctorWorkTime.getEndTime())){
             return BaseResponse.error("开始时间和结束时间必须填写");
         }
+        if(doctorWorkTime.getDid() == null){
+            LymsDoctor doctor = lymsDoctorService.getDoctorByToken(authorization);
+            doctorWorkTime.setDid(doctor.getDid());
+        }
+
         if(doctorWorkTime.getId() == null){
-            if(doctorWorkTime.getDid() == null){
-                LymsDoctor doctor = lymsDoctorService.getDoctorByToken(authorization);
-                doctorWorkTime.setDid(doctor.getDid());
+            QueryWrapper<LymsDoctorWorkTime> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("did",doctorWorkTime.getDid());
+            queryWrapper.eq("status",1);
+            List<LymsDoctorWorkTime> doctorWorkTimes = lymsDoctorWorktimeService.list(queryWrapper);
+            if(CollectionUtils.isNotEmpty(doctorWorkTimes)){
+                return BaseResponse.error("该医生已经维护过");
             }
+
             doctorWorkTime.setStatus(1);
             doctorWorkTime.setCreatedtime(new Date());
         }
@@ -71,10 +80,14 @@ public class DoctorWorktimeController {
     @TokenRequired
     public BaseResponse queryDoctorWorktime(@RequestHeader String authorization){
         LymsDoctor doctor = lymsDoctorService.getDoctorByToken(authorization);
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<LymsDoctorWorkTime> queryWrapper = new QueryWrapper();
         queryWrapper.eq("did",doctor.getDid());
-        LymsDoctorWorkTime doctorWorkTime = lymsDoctorWorktimeService.getOne(queryWrapper);
-        return BaseResponse.ok().setObject(doctorWorkTime);
+        queryWrapper.eq("status",1);
+        List<LymsDoctorWorkTime> doctorWorkTimes = lymsDoctorWorktimeService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(doctorWorkTimes)){
+            return BaseResponse.error("医生未维护过工作时间");
+        }
+        return BaseResponse.ok().setObject(doctorWorkTimes.get(0));
     }
 
     /**
@@ -87,13 +100,13 @@ public class DoctorWorktimeController {
     public BaseResponse queryByDoctorId(Integer did){
         QueryWrapper<LymsDoctorWorkTime> queryWrapper = new QueryWrapper();
         queryWrapper.eq("did",did);
-        LymsDoctorWorkTime doctorWorkTime = lymsDoctorWorktimeService.getOne(queryWrapper);
-        /*if(doctorWorkTime != null){
-            doctorWorkTime.setId(null);
-            doctorWorkTime.setCreatedtime(null);
-            doctorWorkTime.setUpdatedtime(null);
-        }*/
-        return BaseResponse.ok().setObject(doctorWorkTime);
+        queryWrapper.eq("status",1);
+        List<LymsDoctorWorkTime> doctorWorkTimes = lymsDoctorWorktimeService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(doctorWorkTimes)){
+            return BaseResponse.error("医生未维护过工作时间");
+        }
+
+        return BaseResponse.ok().setObject(doctorWorkTimes.get(0));
     }
 
     /**
@@ -110,6 +123,7 @@ public class DoctorWorktimeController {
         if(doctor != null){
             QueryWrapper<LymsDoctorWorkTime> queryWrapper = new QueryWrapper();
             queryWrapper.eq("did",doctor.getDid());
+            queryWrapper.eq("status",1);
             LymsDoctorWorkTime doctorWorkTime = lymsDoctorWorktimeService.getOne(queryWrapper);
             /*if(doctorWorkTime != null){
                 doctorWorkTime.setId(null);