Merge branch 'dev' of wangjun/wlyy2.0 into dev

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -133,7 +133,8 @@ public class QrcodeService {
        if (null!=baseDoctorDO){
            if (null==baseDoctorDO.getQrcode()||"".equals(baseDoctorDO.getQrcode())){
                // 二维码内容
                String content = "hlw_doctor_" + baseDoctorDO.getId() +"_"+baseDoctorDO.getName();
                String doctorname = baseDoctorDO.getName().length()>4?baseDoctorDO.getName().substring(0,4):baseDoctorDO.getName();
                String content = "doctor_" + baseDoctorDO.getId() +"_"+doctorname;
                System.out.println("content"+content);
                // 二维码图片文件名
                String fileName = baseDoctorDO.getId()+".png";
@@ -214,4 +215,5 @@ public class QrcodeService {
            throw new Exception(e.getMessage());
        }
    }
}