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

优化门诊退药数量

See merge request lihong/thmz_system!27

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -266,7 +266,7 @@ public interface MzPharmacyMapper {
             "         yp_mz_fytj.receipt_no,   " +
             "         drugname=c.name+'('+isnull(d.abbr_name,isnull(d.name,''))+')',   " +
             "         specification=c.specification,   " +
-            "         quantity= case yp_mz_fytj.group_no when 81 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity  end,   " +
+            "         quantity= case when isnull(cy_fy, 0) > 0 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity  end,   " +
             "         yp_mz_fytj.unit_price,   " +
             "         yp_mz_fytj.item_no,   " +
             "         yp_mz_fytj.drug_flag,   " +