Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -852,7 +852,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                Mediicineorder order = orderDao.findOne(medicineShipmentLog.getOrderId());
                order.setSellState("1");
                if (org.apache.commons.lang.StringUtils.isNotBlank(order.getApplyNo())){
                    Boolean flag = sickPhysicDosage(order.getBelongCommunity(),order.getApplyNo(),order.getDeptNum());
                    Boolean flag = sickPhysicDosage(order.getBelongCommunity(),order.getApplyNo(),medicineShipmentLog.getEquNum());
                    logger.info("flag"+flag);
                }else {
                    Boolean flag = scanQrdispensaryCode(order.getPickUpNum(),medicineShipmentLog.getEquNum());
@@ -1301,7 +1301,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     *
     * @return
     */
    public boolean sickPhysicDosage(String orgCode,String applyNo,String deptNum){
    public boolean sickPhysicDosage(String orgCode,String applyNo,String deviceNum){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sickPhysicDosage");
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
@@ -1320,6 +1320,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            List<NameValuePair> p = new ArrayList<>();
            p.add(new BasicNameValuePair("orgCode", orgCode));
            p.add(new BasicNameValuePair("applyNo", applyNo));
            p.add(new BasicNameValuePair("equ_num", deviceNum));
            //设置头部
            token = rsjson.getJSONObject("result").getString("accesstoken");