Merge remote-tracking branch 'origin/master'

src/com/gydx/hosp/dao/DocMapper.xml

@@ -49,7 +49,7 @@
     <select id="queryAllDoctor" resultMap="secondDeptMap" parameterType="com.gydx.hosp.vo.DoctorManageVO">
         SELECT id, name, age, sex, d.second_dept_id sdi,s.second_dept_name sdn, degree, status, entry_time, phone, account, password, info
         FROM doctor_manage d join second_dept s on d.second_dept_id=s.second_dept_id
-        WHERE name LIKE CONCAT('%', #{name}, '%')
+        WHERE name LIKE CONCAT('%', #{name}, '%') OR account = #{account}
     </select>
 <!--管理员删除医生-->
     <delete id="delDoctor" parameterType="com.gydx.hosp.vo.DoctorManageVO">