diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index d0cb1d1726..53f4074eab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -213,4 +213,12 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2021/5/8 9:03 上午
      */
     List<AgencyMonthCountResultDTO> selectAllOrgByCustomerId(@Param("customerId")String customerId);
+
+    /**
+     * @Description  查询顶级组织ID
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/24 9:42 上午
+     */
+    ScreenCustomerAgencyEntity selectTopAgency(@Param("customerId")String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
index 5ff8fdf050..86fbe9e336 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
@@ -106,4 +106,12 @@ public interface ScreenCustomerAgencyService{
      * @date 2020/9/24 1:27 下午
      */
     List<OrgNameResultDTO> selectOrgNameAgency(List<String> agencyIds);
+
+    /**
+     * @Description  查询顶级组织ID
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/24 9:42 上午
+     */
+    ScreenCustomerAgencyEntity selectTopAgency(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
index f89e48740e..96019615ea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@@ -256,5 +256,16 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
         return screenCustomerAgencyDao.selectAllAgencyId(customerId);
     }
 
+    /**
+     * @Description  查询顶级组织ID
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/24 9:42 上午
+     */
+    @Override
+    public ScreenCustomerAgencyEntity selectTopAgency(String customerId) {
+        return screenCustomerAgencyDao.selectTopAgency(customerId);
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index c8b12730d0..ddb063806a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
 import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.crm.CustomerRelationEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 import com.epmet.service.crm.CustomerRelationService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
@@ -378,13 +379,46 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                     categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
                 }
             }
-            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
+//            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
+            /**
+             * 查询父子客户所有的分类，根据分类分组，然后把agencyId统一换成父客户的
+             * 在保存一份子客户自己agencyId的
+             */
             if (ScreenConstant.DISTRICT.equals(level)){
+                ScreenCustomerAgencyEntity entity = agencyService.selectTopAgency(customerId);
                 // 子级客户ID
                 List<String> customerIds = relationInfo.stream().map(m -> m.getCustomerId()).collect(Collectors.toList());
                 // 父客户存在的分类
                 List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, true);
+                // 父客户不存在的分类
+                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
+                List<CategoryProjectResultDTO> sonResult = new ArrayList<>();
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){
+                    categoryProjectResultDTOS.addAll(categoryProjectExists);
+                    sonResult.addAll(categoryProjectExists);
+                }
+                if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
+                    categoryProjectResultDTOS.addAll(categoryProjectNotExists);
+                    sonResult.addAll(categoryProjectNotExists);
+                }
+                // 此时的 'categoryProjectResultDTOS' 等于 父子客户所有的分类标签
+                Map<String, List<CategoryProjectResultDTO>> groupByCategoryCode = categoryProjectResultDTOS.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getCategoryCode));
+                List<ScreenProjectCategoryOrgDailyEntity> finalResult = result;
+                groupByCategoryCode.forEach((code, list) -> {
+                    ScreenProjectCategoryOrgDailyEntity e = new ScreenProjectCategoryOrgDailyEntity();
+                    e.setCustomerId(customerId);
+                    e.setCategoryCode(code);
+                    e.setOrgId(entity.getAgencyId());
+                    e.setProjectTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.stream().collect(Collectors.summingInt(CategoryProjectResultDTO::getProjectTotal)));
+                    e.setPid(entity.getPid());
+                    e.setPids(StringUtils.isEmpty(entity.getPids()) ? NumConstant.ZERO_STR : entity.getPids());
+                    finalResult.add(e);
+                });
+                if (!CollectionUtils.isEmpty(sonResult)){
+                    List<ScreenProjectCategoryOrgDailyEntity> entities = ConvertUtils.sourceToTarget(sonResult, ScreenProjectCategoryOrgDailyEntity.class);
+                    result.addAll(entities);
+                }
+                /*if (!CollectionUtils.isEmpty(categoryProjectExists)){
                     result.forEach(r -> {
                         categoryProjectExists.forEach(c -> {
                             if (r.getCategoryCode().equals(c.getCategoryCode())){
@@ -400,12 +434,10 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         result.addAll(f);
                     }
                 }
-                // 父客户不存在的分类
-                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
                 if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
                     List<ScreenProjectCategoryOrgDailyEntity> notExists = ConvertUtils.sourceToTarget(categoryProjectNotExists, ScreenProjectCategoryOrgDailyEntity.class);
                     result.addAll(notExists);
-                }
+                }*/
             }
         }
         // 目前不考虑计算子客户组织直接创建的项目，只算内部客户
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index acb10f1bad..c1b8578691 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -426,4 +426,18 @@
         (SELECT GRID_ID AS orgId FROM screen_customer_grid WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId}) UNION ALL
         (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
     </select>
+
+    <!-- 查询顶级组织ID -->
+    <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
+        SELECT
+            AGENCY_ID,
+            PID,
+            PIDS
+        FROM
+            screen_customer_agency
+        WHERE
+            DEL_FLAG = '0'
+          AND PID = '0'
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>