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

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;
    /**
     * 新增
@@ -274,10 +272,10 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
                    sqlEqt = sqlEqt +" and t.device_code = '"+snCoed+"'";
                }
                logger.debug("查询患者name和code开始");
                List<Map<String,Object>> nameList = hibernateUtils.createSQLQuery(sql);
                List<Map<String,Object>> nameList = jdbcTempalte.queryForList(sql);
                logger.debug("查询患者name和code结束:"+nameList);
                logger.debug("查询设备名称开始");
                List<Map<String,Object>> deviceList = hibernateUtils.createSQLQuery(sqlEqt);
                List<Map<String,Object>> deviceList = jdbcTempalte.queryForList(sqlEqt);
                logger.debug("查询设备名称结束:"+deviceList);
                if(nameList.size()>0){
                    String code = null==nameList.get(0).get("code")?"":nameList.get(0).get("code").toString();