Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/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());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -67,8 +67,6 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
    private UserAgent userAgent;
    @Autowired
    private IotCompanyDao iotCompanyDao;
    @Autowired
    private HibenateUtils hibernateUtils;
    /**
     * 新增
@@ -273,12 +271,12 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
                }if (StringUtils.isNotEmpty(snCoed)){
                    sqlEqt = sqlEqt +" and t.device_code = '"+snCoed+"'";
                }
                logger.debug("查询患者name和code开始");
                List<Map<String,Object>> nameList = hibernateUtils.createSQLQuery(sql);
                logger.debug("查询患者name和code结束:"+nameList);
                logger.debug("查询设备名称开始");
                List<Map<String,Object>> deviceList = hibernateUtils.createSQLQuery(sqlEqt);
                logger.debug("查询设备名称结束:"+deviceList);
                System.out.println("查询患者name和code开始");
                List<Map<String,Object>> nameList = jdbcTempalte.queryForList(sql);
                System.out.println("查询患者name和code结束:"+nameList);
                System.out.println("查询设备名称开始");
                List<Map<String,Object>> deviceList = jdbcTempalte.queryForList(sqlEqt);
                System.out.println("查询设备名称结束:"+deviceList);
                if(nameList.size()>0){
                    String code = null==nameList.get(0).get("code")?"":nameList.get(0).get("code").toString();
                    String name = null==nameList.get(0).get("name")?"":nameList.get(0).get("name").toString();