打印取值修改

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseMapper.java

@@ -85,7 +85,7 @@ public interface YpBaseMapper {
             "  c.group_no=#{ypBase.groupNo} and" +
             "  c.drug_id is not null" +
             "  <when test='ypBase.delFlag!=null'>" +
-            "   and isnull(c.drug_flag,0)=#{ypBase.delFlag}" +
+            "   and isnull(c.del_flag,0)=#{ypBase.delFlag}" +
             "  </when>" +
             " and c.charge_code=b.charge_code)cc order by del_flag" +
             "</script>")

src/main/resources/static/js/yk/drug_storage.js

@@ -752,8 +752,8 @@ function setPrintHtml() {
         $('.sjh').remove();
         for (let i = 0; i < res['data'].length; i++) {
             let data = res['data'][i];
-            let packRetprice = keepTwoDecimal(parseFloat(data['stockAmount']) * parseFloat(data['packRetprice']));
-            let buyPrice = keepTwoDecimal(parseFloat(data['stockAmount']) * parseFloat(data['buyPrice']));
+            let packRetprice = keepTwoDecimal(parseFloat(data['buyAmt']) * parseFloat(data['packRetprice']));
+            let buyPrice = keepTwoDecimal(parseFloat(data['buyAmt']) * parseFloat(data['buyPrice']));
             packRetpriceSum += packRetprice;
             buyPriceSum += buyPrice;
             if (i === 0) {