diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java
index a31a48a..b274a8d 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java
@@ -293,7 +293,6 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
     @ApiOperation(value = "工单表-反馈", notes = "工单表-反馈")
     @RequestMapping(value = "/handFk", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> handFk(@RequestBody WorkOrder workOrder) {
-        workOrderService.handFk(workOrder);
-        return Result.OK("操作成功!");
+        return workOrderService.handFk(workOrder);
     }
 }
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java
index 6303b23..7bbc528 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java
@@ -2,6 +2,7 @@ package com.nu.modules.workorder.service;
 
 import com.nu.modules.workorder.entity.WorkOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -19,5 +20,5 @@ public interface IWorkOrderService extends IService<WorkOrder> {
 
     void saveHjpz(WorkOrder workOrder, HttpServletRequest request);
 
-    void handFk(WorkOrder workOrder);
+    Result<String> handFk(WorkOrder workOrder);
 }
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java
index 56c8343..fa4fa74 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java
@@ -12,6 +12,7 @@ import com.nu.modules.workorder.mapper.WorkOrderMapper;
 import com.nu.modules.workorder.service.IWorkOrderService;
 import com.nu.utils.RabbitMQUtil;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.entity.SysDepartEntity;
 import org.jeecg.common.system.vo.LoginUser;
@@ -103,29 +104,34 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
     @Override
-    public void handFk(WorkOrder workOrder) {
-        WorkOrder upData = new WorkOrder();
-        upData.setId(workOrder.getId());
-        upData.setStatus("3");//平台搭建完成
-        upData.setReplyTime(new Date());
-        baseMapper.updateById(upData);
-
-        WorkOrder workInfo = baseMapper.selectById(workOrder.getId());
-        SysDepartEntity orgInfo = sysBaseAPI.queryOrgInfoById(workOrder.getOrgId());
-        WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto();
-        BeanUtils.copyProperties(workInfo,workOrderMQDto);
-        workOrderMQDto.setOrgId(workInfo.getOrgId());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        workOrderMQDto.setHandleBy(sysUser.getRealname());
-        workOrderMQDto.setReplyTime(new Date());
-        workOrderMQDto.setUrl(orgInfo.getUrl());
-        workOrderMQDto.setMediaUrl(orgInfo.getMediaUrl());
-        workOrderMQDto.setFrontPath(orgInfo.getFrontPath());
-        workOrderMQDto.setContextPath(orgInfo.getContextPath());
-        OrgInfo orgInfo_ = orgInfoService.getById(workOrder.getOrgId());
-        OrgApplyInfoMQDto orgApplyInfoMQDto = new OrgApplyInfoMQDto();
-        BeanUtils.copyProperties(orgInfo_, orgApplyInfoMQDto);
-        workOrderMQDto.setOrgInfo(orgApplyInfoMQDto);
-        rabbitMQUtil.sendToExchange("nu.workOrder", "nu.workOrder.handFk", workOrderMQDto);
+    public Result<String> handFk(WorkOrder workOrder) {
+        try {
+            WorkOrder upData = new WorkOrder();
+            upData.setId(workOrder.getId());
+            upData.setStatus("3");//平台搭建完成
+            upData.setReplyTime(new Date());
+            baseMapper.updateById(upData);
+            WorkOrder workInfo = baseMapper.selectById(workOrder.getId());
+            SysDepartEntity orgInfo = sysBaseAPI.queryOrgInfoById(workOrder.getOrgId());
+            WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto();
+            BeanUtils.copyProperties(workInfo, workOrderMQDto);
+            workOrderMQDto.setOrgId(workInfo.getOrgId());
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            workOrderMQDto.setHandleBy(sysUser.getRealname());
+            workOrderMQDto.setReplyTime(new Date());
+            workOrderMQDto.setUrl(orgInfo.getUrl());
+            workOrderMQDto.setMediaUrl(orgInfo.getMediaUrl());
+            workOrderMQDto.setFrontPath(orgInfo.getFrontPath());
+            workOrderMQDto.setContextPath(orgInfo.getContextPath());
+            OrgInfo orgInfo_ = orgInfoService.getById(workOrder.getOrgId());
+            OrgApplyInfoMQDto orgApplyInfoMQDto = new OrgApplyInfoMQDto();
+            BeanUtils.copyProperties(orgInfo_, orgApplyInfoMQDto);
+            workOrderMQDto.setOrgInfo(orgApplyInfoMQDto);
+            rabbitMQUtil.sendToExchange("nu.workOrder", "nu.workOrder.handFk", workOrderMQDto);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败，请稍后重试！");
+        }
+        return Result.OK("操作成功!");
     }
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
index 8e89304..023dc9e 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
@@ -522,7 +522,8 @@
             sn,
             factory,
             opt_date,
-            opt_type
+            opt_type,
+            remarks
         from nu_iot_device_bind_log
         where org_code = #{params.orgCode}
         <if test="params.dimension != null and params.dimension != ''">
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java
index 208a997..3acb29d 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java
@@ -282,7 +282,6 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
                     tqApiLog901.setId(logEntity901.getId());
                     logService.update(tqApiLog901);
                 }
-
                 syncValueMq(entity901);//抄表同步到业务系统
                 break;
             case "902":
@@ -360,6 +359,7 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
                 deviceIntegration.setDeviceStatus("正常");
                 deviceIntegration.setSn(sn);
                 deviceManagerMapper.editPreviewStatusBySn(deviceIntegration);
+                this.eleRead(entity905);//抄表
                 break;
             case "601":
                 // 定时主动上报表计数据
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
index 32168fa..5b3fb61 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
@@ -480,7 +480,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     }
                 }
             }else{
-                errMsg = "拉取设备为空，请检查参数！";
+                errMsg = "拉取设备失败，请检查设备标识！";
             }
         }
         return errMsg;