Merge branch 'dev-1.1.4' into 'dev-1.1.4'

门诊发药统计问题修复

See merge request lihong/thmz_system!63

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

@@ -40,6 +40,8 @@ public interface YfSpiritAnestheticPrintMapper {
             " where a.charge_item_code=b.code and" +
             "       a.serial=b.serial and" +
             "       a.quantity !=0 and" +
+            "       isnull(a.confirm_flag,2) != 2 and" +
+            "       isnull(a.pay_mark,5)<![CDATA[<>]]> 5 and" +
             "       b.drug_flag in " +
             "       <foreach item='item' collection='drugFlags' separator=',' open='(' close=')'>  " +
             "           #{item}  " +