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

优化发药统计

See merge request hurugang/thmz_system!33

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

@@ -227,7 +227,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       icd_text=isnull(nullif(i.icd_text_new,''), rtrim(i.icd_text))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
-            "       quantity = case when a.serial=d.serial then case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*cy_fy) else a.quantity*a.cy_fy end else case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*a.cy_fy/d.pack_size) else a.quantity*a.cy_fy/d.pack_size end end," +
+            "       quantity = case when a.serial=d.serial then case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*isnull(a.cy_fy,1)) else a.quantity*isnull(a.cy_fy,1) end else case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*isnull(a.cy_fy,1)/d.pack_size) else a.quantity*isnull(a.cy_fy,1)/d.pack_size end end," +
             "       d.specification," +
             "       charge_date=a.confirm_time," +
             "       employee_name=c.name," +