Merge remote-tracking branch 'origin/dev' into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3805,55 +3805,54 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }else {
                    statuss += " ";
                }*/
                Object orderCategory = m.get("orderCategory");
                String odry = "";
                if(orderCategory == null) {
                    odry += " ";
                }else if (orderCategory.equals("1")) {
                    odry += "专家咨询";
                }else if (orderCategory.equals("2")) {
                    odry += "图文诊室";
                }else if (orderCategory.equals("3")) {
                    odry += "视频诊室";
                }else if (orderCategory.equals("4")) {
                    odry += "处方";
                }else if (orderCategory.equals("5")) {
                    odry += "就诊卡充值";
                String orderCategory ="";
                if (m.get("orderCategory")==null){
                    odry = null;
                }else {
                    odry += " ";
                    orderCategory = m.get("orderCategory").toString();
                    if (orderCategory.equals("1")) {
                        odry += "专家咨询";
                    }else if (orderCategory.equals("2")) {
                        odry += "图文诊室";
                    }else if (orderCategory.equals("3")) {
                        odry += "视频诊室";
                    }else if (orderCategory.equals("4")) {
                        odry += "处方";
                    }else if (orderCategory.equals("5")) {
                        odry += "就诊卡充值";
                    }else {
                        odry += " ";
                    }
                }
                Integer orderType = (Integer) m.get("orderType");
                String odte = "";
                if(orderType == null) {
                    odte += " ";
                } else if (orderType == 1) {
                    odte += "图文";
                }else if (orderType == 3) {
                    odte += "视频";
                }else if (orderType == 10) {
                    odte += "就诊卡号";
                }else if (orderType == 11) {
                    odte += "门诊卡号";
                }
                Object payPrice = m.get("payPrice");
                if(m.get("orderType") == null) {
                    odte = null;
                }else{
                    String orderType =  m.get("orderType").toString();
                    if (orderType.equalsIgnoreCase("1")) {
                        odte += "图文";
                    }else if (orderType.equalsIgnoreCase("3")) {
                        odte += "视频";
                    }else if (orderType.equalsIgnoreCase("10")) {
                        odte += "就诊卡号";
                    }else if (orderType.equalsIgnoreCase("11")) {
                        odte += "门诊卡号";
                    }
                }
                String pay = "";
                if (payPrice == null) {
                    pay += " ";
                if (m.get("payPrice") == null) {
                    pay = null;
                }else{
                    String s = payPrice.toString();
                    pay += s;
                    pay = m.get("payPrice").toString();
                }
                Object payTime = m.get("payTime");
                String time = "";
                if (payTime == null) {
                    time += " ";
                if (m.get("payTime") == null) {
                    time = null;
                }else {
                    time = payTime.toString();
                    time = m.get("payTime").toString();
                }

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -106,7 +106,10 @@ public class BasicZuulFilter extends ZuulFilter {
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||
                url.contains("/excelControl")||
                url.contains("/open/gc"))){
                url.contains("/open/gc")||
                url.contains("/prescription/pushListWrite")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite"))){
            logger.info("入参"+ctx.getRequestQueryParams());
            try {
                decrypt(ctx,request);

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@@ -60,7 +60,9 @@ public class PostFilter extends ZuulFilter {
       */ logger.info("进入post过滤器");
        HttpServletRequest request = ctx.getRequest();
        String url = request.getRequestURI();
        if (url.contains("/excelControl")){
        if (url.contains("/excelControl")||url.contains("/prescription/pushListWrite")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite")){
            return true;
        }
        InputStream stream = RequestContext.getCurrentContext().getResponseDataStream();
@@ -132,7 +134,10 @@ public class PostFilter extends ZuulFilter {
            url.contains("/open/noLogin/sfroutepushservice")||
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||url.contains("/oauth/getSsoPublicKey")||
                url.contains("/open/gc"))){
                url.contains("/open/gc")||
                url.contains("/prescription/pushListWrite")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite"))){
            RequestContext.getCurrentContext().setResponseBody(object.toJSONString());
        }else {
            RequestContext.getCurrentContext().setResponseBody(body);