Merge remote-tracking branch 'origin/dev/20200513end_1.2.0' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -823,7 +823,7 @@
             AND d.msg like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
-            AND a.doctor_name = #{filterPageByDeptVO.name}
+            AND a.doctor_name = #{filterPageByDeptVO.doctorName}
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
@@ -872,7 +872,7 @@
             AND d.msg like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
-            AND a.doctor_name = #{filterPageByDeptVO.name}
+            AND a.doctor_name = #{filterPageByDeptVO.doctorName}
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}