diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java
index d36ffee6b..016da84f7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java
@@ -107,9 +107,9 @@ public class ProgramVersionController extends BaseController {
     @PostMapping("/updateVersionFlag")
     @ApiOperation("修改程序版本状态")
     @ApiImplicitParam(name = "id", value = "终端版本id", required = true)
-    public HttpResult updateVersionFlag(@RequestParam("id") String id) {
+    public HttpResult updateVersionFlag(@RequestParam("id") String id, @RequestParam("versionFlag") Integer flag) {
         String methodDescribe = getMethodDescribe("updateVersionFlag");
-        boolean res = programService.updateVersionFlag(id);
+        boolean res = programService.updateVersionFlag(id,flag);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java
index a46d71801..5cd92cd18 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java
@@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper;
 
 import com.njcn.device.pq.pojo.vo.ShowVersionVO;
 import com.njcn.device.pq.pojo.vo.VersionVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +24,7 @@ public interface ProgramVersionMapper {
     /**
      * 修改程序版本状态
      */
-    void updateVersionFlag(String id);
+    void updateVersionFlag(Integer flag,String id);
     /**
      * 修改程序版本状态
      */
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 4a5863374..fc3b8cbca 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -787,7 +787,7 @@
         INNER JOIN pq_device b ON vol.pid = b.id
         INNER JOIN pq_line sub ON dev.pid = sub.id
         INNER JOIN pq_line elc ON sub.pid = elc.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -825,7 +825,7 @@
         INNER JOIN pq_device b ON vol.pid = b.id
         INNER JOIN pq_line sub ON dev.pid = sub.id
         INNER JOIN pq_line elc ON sub.pid = elc.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -854,7 +854,7 @@
         ifnull(m.Actual_Value,0) statisValue
         FROM pq_line a
         INNER JOIN pq_device b ON a.id = b.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
index c1297d66c..cbdcf8bf1 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
@@ -41,7 +41,7 @@
         UPDATE
         cld_version
         SET
-        Version_Flag = 0
+        Version_Flag = #{flag}
         WHERE Id = #{id}
     </update>
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
index a3947618b..d8b6dc3ce 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
@@ -25,7 +25,7 @@ FROM
 	LEFT JOIN cld_dev_version f on a.id = f.line_id and f.flag = 1 and f.state = 1
 	LEFT JOIN cld_version g on f.version_id = g.id
 	LEFT JOIN
-	(select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.line_id
+	(select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.Dev_Id
     where a.id in
         <foreach collection="devIds" item="item" open="(" close=")" separator=",">
             #{item}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java
index 4b151bad2..8c7f5a1d7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java
@@ -37,7 +37,7 @@ public interface ProgramVersionService {
      * 修改程序版本状态
      * @return
      */
-    boolean updateVersionFlag(String id);
+    boolean updateVersionFlag(String id, Integer flag);
     /**
      * 删除版本
      * @return
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
index f52bf4fd5..0f2bb0fbb 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
@@ -138,8 +138,11 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
 
 
     @Override
-    public boolean updateVersionFlag(String id) {
-        programVersionMapper.updateVersionFlag(id);
+    public boolean updateVersionFlag(String id, Integer flag) {
+        Version version = new Version();
+        version.setId(id);
+        version.setVersionFlag(flag);
+        versionMapper.updateById(version);
         return true;
     }
 
diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java
index 341f19c16..af7745c96 100644
--- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java
+++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java
@@ -17,7 +17,6 @@ public class DeviceAbnormalStatisticsJob {
 
     @XxlJob("deviceAbnormalStatisticsJob")
     public void deviceAbnormalStatisticsJob (){
-       // System.out.println("朱鑫宇定时任务");
         String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         log.info("执行日期deviceAbnormalStatisticsJob===============>"+time);
         DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
index c7f193626..30cad716b 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
@@ -101,16 +101,16 @@
 		FROM
             (
             SELECT
-                    cmf.Line_Id deviceId,
+                    cmf.Dev_Id deviceId,
                     IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) +  IFNULL(d1.flow, 0) flowMeal,
                     IFNULL(cmf.Actual_Value,0) actualValue,
                     rsod.online_min/1440 onlineRate
             FROM  cld_month_flow cmf
-            LEFT JOIN cld_dev_meal c ON cmf.Line_Id = c.Line_Id
+            LEFT JOIN cld_dev_meal c ON cmf.Dev_Id = c.Line_Id
             LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
             LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-            LEFT JOIN r_stat_onlinerate_d rsod ON rsod.dev_index = cmf.Line_Id
-            WHERE cmf.Line_Id IN
+            LEFT JOIN r_stat_onlinerate_d rsod ON rsod.dev_index = cmf.Dev_Id
+            WHERE cmf.Dev_Id IN
                 <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>