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/PrescriptionService.java

@@ -3097,6 +3097,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            rs.put("learning",doctorDO.getLearning());
            rs.put("sex",doctorDO.getSex());
            rs.put("popularity",doctorDO.getPopularity());
            rs.put("qrcode",doctorDO.getQrcode());
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
@@ -3363,6 +3365,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            rs.put("visitDept",doctorDO.getVisitDept());
            rs.put("learning",doctorDO.getLearning());
            rs.put("sex",doctorDO.getSex());
            rs.put("qrcode",doctorDO.getQrcode());
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());

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

@@ -136,12 +136,12 @@ public class QrcodeService {
                String content = "hlw_doctor_" + baseDoctorDO.getId() +"_"+baseDoctorDO.getName();
                System.out.println("content"+content);
                // 二维码图片文件名
                String fileName = baseDoctorDO.getId()+"_"+baseDoctorDO.getMobile()+".png";
                String fileName = baseDoctorDO.getId()+".png";
                /*String path = QrcodeService.class.getResource("/").getPath().replace("/WEB-INF/classes/", "")
                        + File.separator + "qrcode";*/
                System.out.println("fileName"+fileName);
                // 通过微信接口生成医生二维码
                String uri = makeQrcodeFromWeiXin(content, fileName.replaceAll("\r\n", ""), token);
                String uri = makeQrcodeFromWeiXin(content, fileName, token);
                System.out.println("uri"+uri);
                baseDoctorDO.setQrcode(uri);
                baseDoctorDao.save(baseDoctorDO);
@@ -198,7 +198,7 @@ public class QrcodeService {
                    }else {
                        // 上传服务器
                        uploadVO = fileUploadService.uploadStream(inputStream,fileName+".png",fastdfs_file_url);
                        uploadVO = fileUploadService.uploadStream(multipartFile.getInputStream(),fileName,fastdfs_file_url);
                    }
                    return uploadVO.getFullUri();