Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -1578,16 +1578,17 @@ public class YkyyEntranceService {
        }
        Map<String,Object> params = new HashedMap();
        params.put("doctorId",yktDoctor);
        params.put("patientId",patient);
        params.put("orderType",orderType);
        HttpResponse response = HttpUtils.doPost("http://www.yanketong.com:90/api/share/PushNotificationToDoctor",params);
        logger.info("眼科通App消息推送接口:doctorId:"+yktDoctor);
        logger.info("眼科通App消息推送接口:patientId:"+patient);
        logger.info("眼科通App消息推送接口:orderType:"+orderType);
        logger.info("眼科通App消息推送接口:url:http://www.yanketong.com:90/api/share/PushNotificationToDoctor?patientId="+patient+"&doctorId="+yktDoctor+"&orderType="+orderType);
        HttpResponse response = HttpUtils.doPost("http://www.yanketong.com:90/api/share/PushNotificationToDoctor?patientId="+patient+"&doctorId="+yktDoctor+"&orderType="+orderType,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("code");
        if(status!=null&&status == 10000){
        if(status!=null&&status != 10000){
            return rs.getString("message");//推送失败原因
        }else{
            return "推送成功";