Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-prescription

js/buz/jw-prescription-list.js

@@ -48,7 +48,7 @@ function getList(isRefresh){
function queryParams(params) {
    return {
        page: params.offset/params.limit + 1,
        page: params.offset/params.limit,
        size: params.limit,
        patient: patient,
    };

js/buz/order-tracking.js

@@ -1,5 +1,6 @@
var request = getRequest(),
    prescriptionCode = request.code;
    prescriptionCode = request.code,
    from = request.from;
var docInfo = window.localStorage.getItem("docInfo");
docInfo = JSON.parse(docInfo);
@@ -172,7 +173,12 @@ function bindEvents(){
    })
    $(".btn-2").on('click', function(){
        history.go(-1);
//      history.go(-1);
        if(from == 'tab') {
            top.toPrePrescriptionTab && top.toPrePrescriptionTab()
        } else {
            history.go(-1);
        }
    })
    $("#doctorName").on('keyup', function(e){