Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfDrugApplyMapper.java

@@ -92,6 +92,7 @@ public interface YfDrugApplyMapper {
             "         a.name like '${searchText}%') and" +
             "        isnull(a.visible_flag,'0') <![CDATA[<>]]> '1' and" +
             "        isnull(a.del_flag,'0') <![CDATA[<>]]> '1'" +
+            "       and (isnull(b.visible_flag_mz,'0') <![CDATA[<>]]> '1' and isnull(b.visible_flag_zy,'0') <![CDATA[<>]]> '1')" +
             " group by  b.charge_code," +
             "          a.name," +
             "          b.serial," +