Merge remote-tracking branch 'origin/xc' into xc

姓名筛选sql调整(·特殊符号执行时查询不出结果)

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml

@@ -109,10 +109,10 @@
             )
         </if>
         <if test="conSession.fromName != null and conSession.fromName != ''">
-            AND c.from_name LIKE CONCAT('%', #{conSession.fromName}, '%')
+            AND INSTR(c.from_name, #{conSession.fromName}) > 0
         </if>
         <if test="conSession.doctorName != null and conSession.doctorName != ''">
-            AND c.to_name LIKE CONCAT('%', #{conSession.doctorName}, '%')
+            AND INSTR(c.to_name, #{conSession.doctorName}) > 0
         </if>
         <if test="conSession.contentStatus != null and conSession.contentStatus != ''">
             AND c.content_status = #{conSession.contentStatus}