Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizPatientMapper.xml

@@ -38,8 +38,10 @@
             and bcr.deleted = 0
             and bp.deleted = 0
             <if test="query.queryCondition != null and query.queryCondition != ''">
+                and (
                 bp.patient_code LIKE concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
-                or bp.name like concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
+                or  bcr.patient_name like concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
+                )
             </if>
             <if test="query.ageRange != null and query.ageRange.size() > 0">
                 AND bcr.patient_age &gt;= #{query.ageRange[0]}