Merge remote-tracking branch 'origin/dev/20200426_2nd' into dev/20200426_2nd

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -362,9 +362,9 @@
             and CONCAT( IFNULL(t.doctor_name,''),IFNULL(t.beh_doctor_name,''),IFNULL(t.director_doctor_name,'')) like CONCAT('%',#{doctorName},'%')
         </if>
         <if test="doctorCode != null and doctorCode != ''">
-            and t.doctor_id = #{doctorCode}
+            and (t.doctor_id = #{doctorCode}
             or t.beh_doctor_id = #{doctorCode}
-            or t.director_doctor_id = #{doctorCode}
+            or t.director_doctor_id = #{doctorCode})
         </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')