Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedevicePrintMessageService.java

@@ -77,9 +77,19 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
                devicePrintMessage.setPicture(printMessage.getPicture());
                return printMessageDao.save(devicePrintMessage);
            }else {
                throw new Exception("该打印设备设置找不到！");
                Mediicinedevice device = mediicineDeviceDao.findByEquNum(printMessage.getDeviceId());
                if (null==device){
                    throw new Exception("该打印设备设置找不到！");
                }
                devicePrintMessage = new MedicineDevicePrintMessage();
                devicePrintMessage.setInfo(printMessage.getInfo());
                devicePrintMessage.setPhone(printMessage.getPhone());
                devicePrintMessage.setRemark(printMessage.getRemark());
                devicePrintMessage.setRemarkEnd(printMessage.getRemarkEnd());
                devicePrintMessage.setPicture(printMessage.getPicture());
                devicePrintMessage.setDeviceId(printMessage.getDeviceId());
                return printMessageDao.save(devicePrintMessage);
            }
        }
    }