diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
index f94d8939e..bd6b0732f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
@@ -66,7 +66,6 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
     @Override
     public void insertPointStatisticalDataDay(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RUploadPointStatisticalDataD> result = new ArrayList<>();
-        List<UploadPointStatisticalParam> paramList = new ArrayList<>();
         //获取省级单位id
         Dept data = deptFeignClient.getRootDept().getData();
         String provinceId = deptFeignClient.getDepSonIdByDeptId(data.getId()).getData().get(0);
@@ -85,9 +84,22 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
         Map<String,List<String>> mapKey = new HashMap<>();
         List<String> otherIds = new ArrayList<>();
         for(SysDicTreePO sysDicTreePO : temTreeList){
-            List<SysDicTreePO> temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())).collect(Collectors.toList());
+            List<SysDicTreePO> temList;
+            if(Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())){
+              temList = sysDicTreePOList.stream()
+                      .filter(item->Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode())||
+                              Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode())||
+                              Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode())||
+                              Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode())||
+                              Objects.equals(item.getCode(), DicTreeEnum.Electrolytic_Load.getCode())
+                      )
+                      .collect(Collectors.toList());
+            }else{
+                temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())||
+                        item.getId().equals(sysDicTreePO.getId())
+                ).collect(Collectors.toList());
+            }
             List<String> ids = temList.stream().map(SysDicTreePO::getId).distinct().collect(Collectors.toList());
-            ids.add(sysDicTreePO.getId());
             mapKey.put(sysDicTreePO.getCode(),ids);
             otherIds.addAll(ids);
         }
@@ -320,9 +332,22 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
         Map<String,List<String>> mapKey = new HashMap<>();
         List<String> otherIds = new ArrayList<>();
         for(SysDicTreePO sysDicTreePO : temTreeList){
-            List<SysDicTreePO> temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())).collect(Collectors.toList());
+            List<SysDicTreePO> temList;
+            if(Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())){
+                temList = sysDicTreePOList.stream()
+                        .filter(item->Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode())||
+                                Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode())||
+                                Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode())||
+                                Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode())||
+                                Objects.equals(item.getCode(), DicTreeEnum.Electrolytic_Load.getCode())
+                        )
+                        .collect(Collectors.toList());
+            }else{
+                temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())||
+                        item.getId().equals(sysDicTreePO.getId())
+                ).collect(Collectors.toList());
+            }
             List<String> ids = temList.stream().map(SysDicTreePO::getId).distinct().collect(Collectors.toList());
-            ids.add(sysDicTreePO.getId());
             mapKey.put(sysDicTreePO.getCode(),ids);
             otherIds.addAll(ids);
         }