diff --git a/src/main/java/com/woniu/hospitalms/controller/RegisterController.java b/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
index 1993706c4659b7c404c06378cc7fff0a83fb9a83..21361421d26f6b94cda383e832e4bbaa4b5e173b 100644
--- a/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
+++ b/src/main/java/com/woniu/hospitalms/controller/RegisterController.java
@@ -1,5 +1,6 @@
 package com.woniu.hospitalms.controller;
 
+import com.woniu.hospitalms.dto.RegisterDTO;
 import com.woniu.hospitalms.dto.ResponseDTO;
 import com.woniu.hospitalms.entity.Medicine;
 import com.woniu.hospitalms.entity.Register;
@@ -44,15 +45,15 @@ public class RegisterController {
      * Description : 根据条件查询挂号信息  <br/>
      * ChangeLog : 1. 创建 (2021/2/22 17:32 [shixin]);
      *
-     * @param register
+     * @param registerDTO
      * @return com.woniu.hospitalms.entity.Register
      */
     @RequestMapping("/select")
     @ResponseBody
-    public ResponseDTO select(@RequestBody Register register) {
+    public ResponseDTO select(@RequestBody RegisterDTO registerDTO) {
 
-        if (registerService.select(register) != null)
-            return ResponseDTO.builder().code(200).message("OK").data(registerService.select(register))
+        if (registerService.select(registerDTO) != null)
+            return ResponseDTO.builder().code(200).message("OK").data(registerService.select(registerDTO))
                     .build();
         else
             return ResponseDTO.builder().code(500).message("No data found")
diff --git a/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java b/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
index 505001c318f3005e1a3559d8f6fb3d4359c24ea1..1e8bb793123d600811fa9676f2cffd1cee36530c 100644
--- a/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
+++ b/src/main/java/com/woniu/hospitalms/dao/RegisterDao.java
@@ -1,5 +1,6 @@
 package com.woniu.hospitalms.dao;
 
+import com.woniu.hospitalms.dto.RegisterDTO;
 import com.woniu.hospitalms.entity.Register;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java b/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8807952924a4ed85cff5ce28d60064bc786bbdb
--- /dev/null
+++ b/src/main/java/com/woniu/hospitalms/dto/RegisterDTO.java
@@ -0,0 +1,45 @@
+package com.woniu.hospitalms.dto;
+
+
+
+import com.woniu.hospitalms.entity.Register;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author shixin <br/>
+ * Date: 2/24/21 10:27 AM <br/>
+ * Description:
+ */
+@Builder
+@Getter
+@Setter
+public class RegisterDTO {
+    /**
+     * 属性筛选条件
+     */
+    private Register register;
+    /**
+     * 模糊查询筛选条件
+     */
+    private String keywords;
+    /**
+     * 起始日期
+     */
+    private Date startDate;
+    /**
+     * 终止日期
+     */
+    private Date endDate;
+    /**
+     * 根据关键字拼接 % 并返回
+     *
+     * @return String
+     */
+    public String getLike() {
+        return (keywords == null) ? (null) : ("%" + keywords + "%");
+    }
+}
diff --git a/src/main/java/com/woniu/hospitalms/entity/Register.java b/src/main/java/com/woniu/hospitalms/entity/Register.java
index 007d4b49245896b64aed68ba77ed3d4ab9188902..18fb7abe7f9d95eb121aca684b5939e03b78ffbc 100644
--- a/src/main/java/com/woniu/hospitalms/entity/Register.java
+++ b/src/main/java/com/woniu/hospitalms/entity/Register.java
@@ -73,7 +73,16 @@ public class Register {
     /*
      *患者名字
      */
+
     private String name;
+    /**
+     * 起始日期
+     */
+    private Date startDate;
+    /**
+     * 终止日期
+     */
+    private Date endDate;
 
     /*
      *软删除
diff --git a/src/main/java/com/woniu/hospitalms/service/RegisterService.java b/src/main/java/com/woniu/hospitalms/service/RegisterService.java
index 64d0865b256c948ba889a74ae3a5653e2e336a0d..4ac4c8d2e49ed57cf7e10ce13fe1d3a1b91e7f96 100644
--- a/src/main/java/com/woniu/hospitalms/service/RegisterService.java
+++ b/src/main/java/com/woniu/hospitalms/service/RegisterService.java
@@ -1,6 +1,7 @@
 package com.woniu.hospitalms.service;
 
 import com.github.pagehelper.PageInfo;
+import com.woniu.hospitalms.dto.RegisterDTO;
 import com.woniu.hospitalms.entity.Register;
 
 import java.util.List;
@@ -26,11 +27,11 @@ public interface RegisterService {
      * Description : 条件查询  <br/>
      * ChangeLog : 1. 创建 (2021/2/23 9:55 [shixin]);
      *
-     * @param register 实例对象
+     * @param registerDTO 实例对象
      * @return com.woniu.hospitalms.entity.Register 实例对象
      */
 
-    PageInfo<Register> select(Register register);
+    PageInfo<Register> select(RegisterDTO registerDTO);
 
     /**
      * Description : 通过id查询name  <br/>
diff --git a/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java b/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
index 09b9d32fa6b53dc7bb772c89d455cfe283e148d6..1cf97baa43096659ff4e6d5a7656d3c238253efe 100644
--- a/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
+++ b/src/main/java/com/woniu/hospitalms/service/impl/RegisterServiceImpl.java
@@ -3,6 +3,7 @@ package com.woniu.hospitalms.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.woniu.hospitalms.dao.RegisterDao;
+import com.woniu.hospitalms.dto.RegisterDTO;
 import com.woniu.hospitalms.entity.Employee;
 import com.woniu.hospitalms.entity.Register;
 import com.woniu.hospitalms.service.RegisterService;
@@ -33,14 +34,14 @@ public class RegisterServiceImpl implements RegisterService {
 /**
  * Description : 查询挂号单  <br/>
  * ChangeLog : 1. 创建 (2021/2/23 9:24 [shixin]);
- * @param register
+ * @param registerDTO
  * @return com.woniu.hospitalms.entity.Register
  */
 
     @Override
-    public PageInfo<Register> select(Register register) {
-        PageHelper.startPage(register.getPageNum(), register.getPageSize());
-        List<Register> registers = registerDao.select(register);
+    public PageInfo<Register> select(RegisterDTO registerDTO) {
+        PageHelper.startPage(registerDTO.getRegister().getPageNum(), registerDTO.getRegister().getPageSize());
+        List<Register> registers = registerDao.select(registerDTO.getRegister());
         PageInfo<Register> registerPageInfo = new PageInfo<>(registers);
         return registerPageInfo;
     }
diff --git a/src/main/resources/mapper/RegisterDao.xml b/src/main/resources/mapper/RegisterDao.xml
index 5406eee6ba8153f3257a9e781b9234cf9fe05e8e..185bb959c601eeed17d71a96a7cedf5f3e4cdab5 100644
--- a/src/main/resources/mapper/RegisterDao.xml
+++ b/src/main/resources/mapper/RegisterDao.xml
@@ -40,12 +40,13 @@
             <if test="doctor != null and doctor!=0 ">
                 and doctor = #{doctor}
             </if>
-            <if test="date != null ">
-                and `date` = #{date}
-            </if>
             <if test="name!='' and name!=null">
                 and p.name like "%"#{name}"%"
             </if>
+            <!--按起始、结束日期筛选-->
+            <if test="startDate!=null and endDate!=null">
+                and `date` between #{startDate} and #{endDate}
+            </if>
 
         </where>
         order by re.id