居民健康管理平台修改设备导入厂商创建逻辑

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -176,16 +176,13 @@ public class WlyyDeviceService {
            //判断设备厂商是否存在，不存在则存入
            if(StringUtils.isNotBlank(device.getManufacturerId())) {
                DeviceManufacturer manufacturer = deviceManufacturerDao.findByCode(device.getManufacturerId());
                if (manufacturer == null) {
                if (manufacturer == null && StringUtils.isNotBlank(device.getManufacturerCode()) && StringUtils.isNotBlank(device.getManufacturer())) {
                    manufacturer = new DeviceManufacturer();
                    manufacturer.setCode(device.getManufacturerId());
                    manufacturer.setManufacturerCode(device.getManufacturerCode());
                    manufacturer.setManufacturerName(device.getManufacturer());
                    manufacturer.setCzrq(new Date());
                    deviceManufacturerDao.save(manufacturer);
                }else {
                    device.setManufacturerCode(manufacturer.getManufacturerCode());
                    device.setManufacturer(manufacturer.getManufacturerName());
                }
            }
            device.setIsGrant(0);