diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
index f64cb44..66d006f 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
@@ -244,12 +244,8 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
         for (PointQueryResponse pointInfo : response) {
             String dataKey = pointInfo.getDataPoint();
             Long updateTime = Long.valueOf(bmsdJson.get("timestamp").toString());
-            int isNeedDeviceId = pointInfo.getIsNeedDeviceId();
-            if (isNeedDeviceId == 1 && "PCS".equals(pointInfo.getDataDevice())) {// 需要根据deviceId拼接point
-                dataKey = deviceId + dataKey;
+            if ("PCS".equals(pointInfo.getDataDevice())) {
                 updateTime = Long.valueOf(pcsJson.get("timestamp").toString());
-            } else if (isNeedDeviceId == 1 && "BMSD".equals(pointInfo.getDataDevice())){
-                dataKey = bmsdDeviceId + dataKey;
             }
             pointInfo.setDataPoint(dataKey);
             pointInfo.setPointValue(obj.get(dataKey));