|
|
@ -5,7 +5,6 @@ import com.yihu.wlyy.device.entity.WlyyDevice;
|
|
|
import com.yihu.wlyy.device.repository.DeviceManufacturerDao;
|
|
|
import com.yihu.wlyy.device.repository.WlyyDeviceDao;
|
|
|
import com.yihu.wlyy.entity.DmDevice;
|
|
|
import com.yihu.wlyy.entity.WlyyPatientDevice;
|
|
|
import com.yihu.wlyy.repository.DmDeviceDao;
|
|
|
import com.yihu.wlyy.service.common.excel.ExcelData;
|
|
|
import com.yihu.wlyy.util.ReadExcelUtil;
|
|
|
@ -178,6 +177,7 @@ public class WlyyDeviceService {
|
|
|
if(StringUtils.isNotBlank(device.getManufacturerId())) {
|
|
|
DeviceManufacturer manufacturer = deviceManufacturerDao.findByCode(device.getManufacturerId());
|
|
|
if (manufacturer == null) {
|
|
|
manufacturer = new DeviceManufacturer();
|
|
|
manufacturer.setCode(device.getManufacturerId());
|
|
|
manufacturer.setManufacturerCode(device.getManufacturerCode());
|
|
|
manufacturer.setManufacturerName(device.getManufacturer());
|
