diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index 9f55340594..df66aca920 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -65,4 +65,14 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	 */
 	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfo(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
 																	 @Param("level")String level, @Param("customerId")String customerId, @Param("existsStatus")Boolean existsStatus);
+
+	/**
+	 * @Description  根据客户ID，天ID，组织ID删除旧数据
+	 * @Param customerId
+	 * @Param dateId
+	 * @Param orgIds
+	 * @author zxc
+	 * @date 2021/5/21 3:26 下午
+	 */
+	int deleteAppointData(@Param("customerId") String customerId, @Param("dateId") String dateId,@Param("orgIds")List<String> orgIds);
 }
\ 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 e46b85f91d..c8b12730d0 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
@@ -179,6 +179,12 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
              * 1.查自己客户分类标签统计
              * 2.查询子级客户分类标签【分为 epmet_category_code is null 和 is not null】，pid = '0'，跟父客户对比，同类标签项目数累加，不同直接添加到父客户
              * 注：加入直属网格
+             *
+             * 2021-05-21新注释
+             * 1.查询客户自己的分类标签
+             * 2.查询子客户的分类标签，把子客户分类标签一样的累加
+             * 3.子客户累加后的跟父客户对比 categoryCode，一样累加到父客户，不一样直接添加到父客户，agencyId一并改为父客户的
+             * 4.父客户数据处理好，在存储一套子客户数据
              */
             disposeMoreCustomer(customerId,dateId,relationInfo);
         }
@@ -254,16 +260,19 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                     });
                     Map<Boolean, List<CategoryProjectResultDTO>> groupByStatus = categoryProjectGrid.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus));
                     List<CategoryProjectResultDTO> categoryProjectResultDTOS1 = groupByStatus.get(false);
-                    if (!CollectionUtils.isEmpty(categoryProjectResultDTOS1)) categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
+                    if (!CollectionUtils.isEmpty(categoryProjectResultDTOS1)) {
+                        categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
+                    }
                 }
             }
             result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
         }
         // 组织项目分类 项目数
+        List<String> orgIds = new ArrayList<>();
         Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)){
-            List<String> orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
+            orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
             List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId);
             if (!CollectionUtils.isEmpty(result)){
                 if (!CollectionUtils.isEmpty(screenProjectCategory)){
@@ -291,7 +300,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 result.forEach(r -> {r.setOrgType(level);r.setDateId(dateId);});
             }
         }
-        deleteAndInsert(customerId,dateId,result);
+        deleteAndInsert(customerId,dateId,result,orgIds);
     }
 
     /**
@@ -400,10 +409,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
             }
         }
         // 目前不考虑计算子客户组织直接创建的项目，只算内部客户
+        List<String> orgIds = new ArrayList<>();
         Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
-            List<String> orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
+            orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
             List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {
@@ -434,7 +444,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 });
             }
         }
-        deleteAndInsert(customerId,dateId,result);
+        deleteAndInsert(customerId,dateId,result,orgIds);
     }
 
     /**
@@ -445,13 +455,16 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
      * @date 2021/3/23 上午10:52
      */
     @Transactional(rollbackFor = Exception.class)
-    public void deleteAndInsert(String customerId, String dateId, List<ScreenProjectCategoryOrgDailyEntity> needInsert){
+    public void deleteAndInsert(String customerId, String dateId, List<ScreenProjectCategoryOrgDailyEntity> needInsert,List<String> orgIds){
         if (CollectionUtils.isEmpty(needInsert)){
             return;
         }
+        if (CollectionUtils.isEmpty(orgIds)){
+            return;
+        }
         Integer row = NumConstant.ZERO;
         do {
-            row = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+            row = baseDao.deleteAppointData(customerId, dateId,orgIds);
         }while (row > NumConstant.ZERO && row == NumConstant.ONE_THOUSAND);
         List<List<ScreenProjectCategoryOrgDailyEntity>> partition = ListUtils.partition(needInsert, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index 07b8d2f5b8..9a4718aca8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -9,6 +9,19 @@
         limit 1000
     </delete>
 
+    <!-- 根据客户ID，天ID，组织ID删除旧数据 -->
+    <delete id="deleteAppointData">
+        delete from screen_project_category_org_daily
+        where customer_id = #{customerId}
+          and date_id = #{dateId}
+          and (
+              <foreach collection="orgIds" item="orgId" separator=" OR ">
+                  ORG_ID = #{orgId}
+              </foreach>
+            )
+        limit 1000
+    </delete>
+
     <!-- 查询组织分类信息 -->
     <select id="selectOrgCategoryInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
         SELECT