diff --git a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseLineMonitorServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseLineMonitorServiceImpl.java
index 9604da9d..771c1b3d 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseLineMonitorServiceImpl.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseLineMonitorServiceImpl.java
@@ -95,7 +95,7 @@ public class BaseLineMonitorServiceImpl implements IBaseLineMonitorService {
                 if (lineMonitor.getObjid().equals(lineMonitor.getParentId())) {
                     continue;
                 }
-                Long grade = 0L;
+                Long grade = 1L;
                 grade = updateLineMonitorGrade(baseLineMonitors, lineMonitor, objIdList, grade);
                 if (StringUtils.isNull(lineMonitor.getGrade()) || !lineMonitor.getGrade().equals(grade)) {
                     lineMonitor.setGrade(grade);
@@ -111,7 +111,6 @@ public class BaseLineMonitorServiceImpl implements IBaseLineMonitorService {
 
     /**
      * 线路计量信息等级更新
-     *
      * @param baseLineMonitors
      * @param lineMonitor
      * @param objIdList
@@ -294,7 +293,6 @@ public class BaseLineMonitorServiceImpl implements IBaseLineMonitorService {
 
     /**
      * 递归查找monitorId最下级节点中的表
-     *
      * @param monitors
      * @param monitorId
      * @return
diff --git a/op-modules/op-energy/src/main/java/com/op/energy/base/utils/ExportExcelUtil.java b/op-modules/op-energy/src/main/java/com/op/energy/base/utils/ExportExcelUtil.java
index 27d842cb..8b1549b2 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/base/utils/ExportExcelUtil.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/base/utils/ExportExcelUtil.java
@@ -609,6 +609,41 @@ public class ExportExcelUtil<T> {
         return result;
     }
 
+    /**
+     * 获取List连续相同数据的开始和结束的下标
+     * 与计量设备编号联动
+     * @param countList
+     * @return
+     */
+    public static List<int[]> findConsecutiveIndices(List<String> countList, List<String> monitorIdList) {
+        List<int[]> result = new ArrayList<>();
+
+        if (monitorIdList == null || monitorIdList.isEmpty()) {
+            return result;
+        }
+
+        int start = 0;
+        int end = 0;
+
+        for (int i = 1; i < monitorIdList.size(); i++) {
+            if (monitorIdList.get(i).equals(monitorIdList.get(i - 1))) {
+                end = i;
+            } else {
+                if (start != end) {
+                    result.add(new int[]{start, end});
+                }
+                start = i;
+                end = i;
+            }
+        }
+
+        if (start != end) {
+            result.add(new int[]{start, end});
+        }
+
+        return result;
+    }
+
     /**
      * 创建表格样式
      *
diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java
index 412cf097..7db82206 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java
@@ -187,7 +187,8 @@ public class dataAnalysisController extends BaseController {
 
     @PostMapping("/classificationExport")
     @ResponseBody
-    public void classificationExport(HttpServletResponse response, @RequestParam(required = false) Map paramMap) {
+    public void classificationExport(HttpServletResponse response, @RequestParam(required = false) Map paramMap)
+    {
         List<ExportReport> list = dataAnalysisService.classificationExportReport(paramMap);
 
         List<ExportReport> originalList = SpringUtils.deepCopy(list);
@@ -198,12 +199,18 @@ public class dataAnalysisController extends BaseController {
             ArrayList<String> threeList = new ArrayList<>();
             ArrayList<String> fourList = new ArrayList<>();
             ArrayList<String> fiveList = new ArrayList<>();
+            ArrayList<String> threeMList = new ArrayList<>();
+            ArrayList<String> fourMList = new ArrayList<>();
+            ArrayList<String> fiveMList = new ArrayList<>();
             for (int i = 0; i < list.size(); i++) {
                 oneList.add(list.get(i).getOneExpend() == null ? "" : list.get(i).getOneExpend().toPlainString());
                 twoList.add(list.get(i).getTwoExpend() == null ? "" : list.get(i).getTwoExpend().toPlainString());
                 threeList.add(list.get(i).getThreeExpend() == null ? "" : list.get(i).getThreeExpend().toPlainString());
                 fourList.add(list.get(i).getFourExpend() == null ? "" : list.get(i).getFourExpend().toPlainString());
                 fiveList.add(list.get(i).getFiveExpend() == null ? "" : list.get(i).getFiveExpend().toPlainString());
+                threeMList.add(list.get(i).getThreeMonitorId() == null ? "" : list.get(i).getThreeMonitorId());
+                fourMList.add(list.get(i).getFourMonitorId() == null ? "" : list.get(i).getFourMonitorId());
+                fiveMList.add(list.get(i).getFiveMonitorId() == null ? "" : list.get(i).getFiveMonitorId());
             }
             List<int[]> oneListIndices = findConsecutiveIndices(oneList);
             for (int[] consecutiveIndex : oneListIndices) {
@@ -217,24 +224,27 @@ public class dataAnalysisController extends BaseController {
                     list.get(i).setTwoExpend(null);
                 }
             }
-            List<int[]> threeListIndices = findConsecutiveIndices(threeList);
+            List<int[]> threeListIndices = findConsecutiveIndices(threeList, threeMList);
             for (int[] consecutiveIndex : threeListIndices) {
+                if(consecutiveIndex[1] - consecutiveIndex[0] < 1){
+                    continue;
+                }
                 for (int i = consecutiveIndex[0] + 1; i < consecutiveIndex[1] + 1; i++) {
                     list.get(i).setThreeExpend(null);
                 }
             }
-            List<int[]> fourListIndices = findConsecutiveIndices(fourList);
+            List<int[]> fourListIndices = findConsecutiveIndices(fourList, fourMList);
             for (int[] consecutiveIndex : fourListIndices) {
-                if (consecutiveIndex[1] - consecutiveIndex[0] < 2) {
+                if(consecutiveIndex[1] - consecutiveIndex[0] < 1){
                     continue;
                 }
                 for (int i = consecutiveIndex[0] + 1; i < consecutiveIndex[1] + 1; i++) {
                     list.get(i).setFourExpend(null);
                 }
             }
-            List<int[]> fiveListIndices = findConsecutiveIndices(fiveList);
+            List<int[]> fiveListIndices = findConsecutiveIndices(fiveList, fiveMList);
             for (int[] consecutiveIndex : fiveListIndices) {
-                if (consecutiveIndex[1] - consecutiveIndex[0] < 2) {
+                if(consecutiveIndex[1] - consecutiveIndex[0] < 1){
                     continue;
                 }
                 for (int i = consecutiveIndex[0] + 1; i < consecutiveIndex[1] + 1; i++) {
diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
index 4c4e19ed..0321117c 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
@@ -320,7 +320,6 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         baseLineLoss.setParams(params);
         List<BaseLineLoss> baseLineLosses = baseLineLossMapper.selectBaseLineLossList(baseLineLoss);
         try {
-            List<BaseLineMonitor> lineMonitorList = baseLineMonitorMapper.selectBaseLineMonitorList(new BaseLineMonitor());
             for (BaseLineLoss lineLoss : baseLineLosses) {
                 HashMap<String, String> hashMap = new HashMap<>();
                 List<Map<String, String>> energyConsumptionList = new ArrayList<>();
diff --git a/op-modules/op-energy/src/main/resources/mapper/base/BaseLineMonitorMapper.xml b/op-modules/op-energy/src/main/resources/mapper/base/BaseLineMonitorMapper.xml
index ffeffcca..e610bea3 100644
--- a/op-modules/op-energy/src/main/resources/mapper/base/BaseLineMonitorMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/base/BaseLineMonitorMapper.xml
@@ -32,43 +32,93 @@
     </resultMap>
 
     <sql id="selectBaseLineMonitorVo">
-        select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status, collect_device_id, build_id, ancestors, grade, correct_value, is_ammeter, line_name, line_length, line_status, power_capacity, water_capacity, dept_id, user_id, create_by, create_time, update_by, update_time from base_line_monitor
+        select blm.objid,
+               blm.parent_id,
+               blm.monitor_id,
+               bmi.monitor_name,
+               bmi.monitor_addr,
+               blm.monitor_type,
+               blm.monitor_status,
+               blm.collect_device_id,
+               blm.build_id,
+               blm.ancestors,
+               blm.grade,
+               blm.correct_value,
+               blm.is_ammeter,
+               blm.line_name,
+               blm.line_length,
+               blm.line_status,
+               blm.power_capacity,
+               blm.water_capacity,
+               blm.dept_id,
+               blm.user_id,
+               blm.create_by,
+               blm.create_time,
+               blm.update_by,
+               blm.update_time
+        from base_line_monitor blm
+                 left join base_monitor_info bmi on blm.monitor_id = bmi.monitor_id
     </sql>
 
     <select id="selectBaseLineMonitorList" parameterType="BaseLineMonitor" resultMap="BaseLineMonitorResult">
         <include refid="selectBaseLineMonitorVo"/>
         <where>
-            <if test="parentId != null ">and parent_id = #{parentId}</if>
-            <if test="monitorName != null  and monitorName != ''">and monitor_name like concat('%', #{monitorName},
+            <if test="parentId != null ">and blm.parent_id = #{parentId}</if>
+            <if test="monitorName != null  and monitorName != ''">and blm.monitor_name like concat('%', #{monitorName},
                 '%')
             </if>
-            <if test="monitorAddr != null  and monitorAddr != ''">and monitor_addr = #{monitorAddr}</if>
-            <if test="monitorType != null ">and monitor_type = #{monitorType}</if>
-            <if test="monitorStatus != null ">and monitor_status = #{monitorStatus}</if>
-            <if test="collectDeviceId != null  and collectDeviceId != ''">and collect_device_id = #{collectDeviceId}
+            <if test="monitorAddr != null  and monitorAddr != ''">and blm.monitor_addr = #{monitorAddr}</if>
+            <if test="monitorType != null ">and blm.monitor_type = #{monitorType}</if>
+            <if test="monitorStatus != null ">and blm.monitor_status = #{monitorStatus}</if>
+            <if test="collectDeviceId != null  and collectDeviceId != ''">and blm.collect_device_id = #{collectDeviceId}
             </if>
-            <if test="buildId != null  and buildId != ''">and build_id = #{buildId}</if>
-            <if test="ancestors != null  and ancestors != ''">and ancestors = #{ancestors}</if>
-            <if test="grade != null ">and grade = #{grade}</if>
-            <if test="correctValue != null ">and correct_value = #{correctValue}</if>
-            <if test="isAmmeter != null  and isAmmeter != ''">and is_ammeter = #{isAmmeter}</if>
-            <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
-            <if test="lineLength != null ">and line_length = #{lineLength}</if>
-            <if test="lineStatus != null ">and line_status = #{lineStatus}</if>
-            <if test="powerCapacity != null ">and power_capacity = #{powerCapacity}</if>
-            <if test="waterCapacity != null ">and water_capacity = #{waterCapacity}</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="buildId != null  and buildId != ''">and blm.build_id = #{buildId}</if>
+            <if test="ancestors != null  and ancestors != ''">and blm.ancestors = #{ancestors}</if>
+            <if test="grade != null ">and blm.grade = #{grade}</if>
+            <if test="correctValue != null ">and blm.correct_value = #{correctValue}</if>
+            <if test="isAmmeter != null  and isAmmeter != ''">and blm.is_ammeter = #{isAmmeter}</if>
+            <if test="lineName != null  and lineName != ''">and blm.line_name like concat('%', #{lineName}, '%')</if>
+            <if test="lineLength != null ">and blm.line_length = #{lineLength}</if>
+            <if test="lineStatus != null ">and blm.line_status = #{lineStatus}</if>
+            <if test="powerCapacity != null ">and blm.power_capacity = #{powerCapacity}</if>
+            <if test="waterCapacity != null ">and blm.water_capacity = #{waterCapacity}</if>
+            <if test="deptId != null ">and blm.dept_id = #{deptId}</if>
+            <if test="userId != null ">and blm.user_id = #{userId}</if>
         </where>
     </select>
 
     <select id="selectBaseLineMonitorByObjid" parameterType="Long" resultMap="BaseLineMonitorResult">
         <include refid="selectBaseLineMonitorVo"/>
-        where objid = #{objid}
+        where blm.objid = #{objid}
     </select>
     <select id="selectBaseLineMonitorByMonitorId" resultMap="BaseLineMonitorResult">
-        select t.objid, t.parent_id, t.monitor_id, t.monitor_name, t.monitor_addr, t.monitor_type, t.monitor_status, t.collect_device_id, t.build_id, t.ancestors, t.grade, t.correct_value, t.is_ammeter, t.line_name, t.line_length, t.line_status, t.power_capacity, t.water_capacity, t.dept_id, t.user_id, t.create_by, t.create_time, t.update_by, t.update_time
+        select t.objid,
+               t.parent_id,
+               t.monitor_id,
+               t.monitor_name,
+               t.monitor_addr,
+               t.monitor_type,
+               t.monitor_status,
+               t.collect_device_id,
+               t.build_id,
+               t.ancestors,
+               t.grade,
+               t.correct_value,
+               t.is_ammeter,
+               t.line_name,
+               t.line_length,
+               t.line_status,
+               t.power_capacity,
+               t.water_capacity,
+               t.dept_id,
+               t.user_id,
+               t.create_by,
+               t.create_time,
+               t.update_by,
+               t.update_time
         from base_line_monitor t
+                 left join (select parent_id, count(*) sum from base_line_monitor group by parent_id) tp
+                           on tp.parent_id = t.objid
         where t.monitor_id = #{monitor_id}
     </select>
     <insert id="insertBaseLineMonitor" parameterType="BaseLineMonitor" useGeneratedKeys="true" keyProperty="objid">
diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
index 84af652d..04d8d248 100644
--- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
@@ -88,13 +88,13 @@
                 (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
-                and begin_time between #{params.beginBeginTime} and #{params.endBeginTime}
+                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime}
             </if>
             <if test="params.startTime != null and params.startTime != '' and params.endTime != null and params.endTime != ''">
-                and begin_time between #{params.startTime} and #{params.endTime}
+                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime}
             </if>
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
-                and begin_time between #{params.beginCollectTime} and #{params.endCollectTime}
+                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime}
             </if>
             <if test="endTime != null ">and end_time = #{endTime}</if>
             <if test="recordTime != null ">and record_time = #{recordTime}</if>
@@ -220,9 +220,8 @@
         rpd.monitor_id monitorId,
         m.monitor_name monitorName,
         m.monitor_addr address,
-        sum(isnull(ert.expend,0)) expend,
+        sum(isnull(rpd.expend,0)) expend,
         max(rpd.meter_value) meterValue,
-        GROUP_CONCAT(DISTINCT bpu.user_name SEPARATOR ',') owningUser,
         concat(#{beginCollectTime},' 至 ',#{endCollectTime}) timeRange,
         m.monitor_hierarchy monitorHierarchy,
         m.grade
@@ -243,7 +242,7 @@
         left join base_public_user bpu on bmp.public_share_id = bpu.id
         <where>
             <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120)e,10) between #{beginCollectTime} and #{endCollectTime}
+                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120),10) between #{beginCollectTime} and #{endCollectTime}
             </if>
             <if test="monitorIdList != null  and monitorIdList.size > 0">
                 and rpd.monitor_id IN