Merge branch 'develop' into dev/20200426_2nd

src/main/java/com/diagbot/vo/BehospitalPageVO.java

@@ -66,4 +66,14 @@ public class BehospitalPageVO extends Page implements Serializable {
      */
     private String level;
 
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -40,6 +40,12 @@
             on a.behospital_code = c.behospital_code and c.is_deleted = 'N'
         ) t
         where t.is_deleted = 'N'
+        <if test="behDeptName != null and behDeptName != ''">
+            and t.beh_dept_name like CONCAT('%',#{behDeptName},'%')
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            and t.doctor_name like CONCAT('%',#{doctorName},'%')
+        </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
         </if>