库存量以及可用天数修改

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

@@ -129,8 +129,12 @@ public interface YfDrugApplyMapper {
             "SELECT  top ${pageBean.pageSize} * from " +
             "(SELECT  row_number() over (order by b.mini_stock_amount-b.stock_amount desc) RowNumber," +
             " b.charge_code,b.drugname as name,b.specification,b.pack_retprice,b.max_stock_amount,b.mini_stock_amount,b.serial," +
-            " b.stock_amount,b.manufactory as manu_code,b.zb_supplyer" +
+            " (b.stock_amount+ y.yfl) as stock_amount,b.manufactory as manu_code,b.zb_supplyer" +
             " from yp_base b WITH(NOLOCK)" +
+            " left join (select sum(stock_amount) yfl, charge_code, serial " +
+            " from yp_base_yf WITH ( NOLOCK ) " +
+            " group by charge_code, serial) y" +
+            " on b.charge_code = y.charge_code and b.serial = y.serial " +
             " where" +
             "   <when test='chargeCode!=null and chargeCode!=\"\"'>"+
             "           b.charge_code =#{chargeCode} and " +

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfDrugApplyServiceImpl.java

@@ -65,7 +65,8 @@ public class YfDrugApplyServiceImpl implements YfDrugApplyService {
                 ypBaseBoundVo.setThirtyDayDosage(ypBaseBoundSum.getThirtyDayDosage());
                 ypBaseBoundVo.setSixtyDayDosage(ypBaseBoundSum.getSixtyDayDosage());
                 ypBaseBoundVo.setFourteenDayDosage(ypBaseBoundSum.getFourteenDayDosage());
-                ypBaseBoundVo.setAvailableDay(Double.parseDouble(ypBaseBoundVo.getSevenDayDosage()==0?"0":ypBaseBoundVo.getStockAmount()/ypBaseBoundVo.getSevenDayDosage()+""));
+                // 取14天用量日均值的用量来作为可用每天的使用量
+                ypBaseBoundVo.setAvailableDay(Double.parseDouble(ypBaseBoundVo.getFourteenDayDosage()==0?"0":(int)(ypBaseBoundVo.getStockAmount()/(ypBaseBoundVo.getFourteenDayDosage()/14))+""));
             }
         });
         return ypBaseBoundVos;

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

@@ -133,7 +133,7 @@ function getYpBaseBound() {
                 valign: 'middle'
             }, {
                 field: 'stockAmount',
-                title: '药库库存',
+                title: '库存量',
                 align: "center",
                 valign: 'middle'
             }, {