diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 3b03d3768d..74af482075 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -177,143 +177,155 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             threadPool.submit(() -> {
                 //党员基本情况screen_cpc_base_data
                 try {
-                    partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                //先锋模范screen_pioneer_data
-                if (isLast) {
                     try {
-                        pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+                        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
                     } catch (Exception e) {
-                        log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                     }
-                    try {
-                        pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                    }
-                    try {
-                        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    //先锋模范screen_pioneer_data
+                    if (isLast) {
+                        try {
+                            pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
+                        try {
+                            pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
+                        try {
+                            pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
                     }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
 
-                latch.countDown();
-                log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
                 //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
                 try {
-                    publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                if (isLast) {
-                    //基层治理- 难点赌点 screen_difficulty_data  |  screen_difficulty_img_data
                     try {
-                        ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
-                        param2.setCustomerId(customerId);
-                        param2.setDateId(null);
-                        log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
-                        //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
-
-                        screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
-                        log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+                        publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
                     } catch (Exception e) {
-                        log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    if (isLast) {
+                        //基层治理- 难点赌点 screen_difficulty_data  |  screen_difficulty_img_data
+                        try {
+                            ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
+                            param2.setCustomerId(customerId);
+                            param2.setDateId(null);
+                            log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
+                            //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
+
+                            screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
+                            log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+                        } catch (Exception e) {
+                            log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
                     }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                latch.countDown();
-                log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
-                ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-                param.setCustomerId(customerId);
-                param.setDateId(dateId);
-                //中央区 screen_user_total_data
                 try {
-                    screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
-                } catch (Exception e) {
-                    log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+                    param.setCustomerId(customerId);
+                    param.setDateId(dateId);
+                    //中央区 screen_user_total_data
+                    try {
+                        screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
+                    } catch (Exception e) {
+                        log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    // 项目(事件)分析按网格_按天统计
-                    screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    // 项目(事件)分析按组织_按天统计
-                    screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        // 项目(事件)分析按网格_按天统计
+                        screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        // 项目(事件)分析按组织_按天统计
+                        screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                //按天统计：网格内各个分类下的项目总数
-                try {
-                    screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    //按天统计：网格内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                // 按天统计：组织内各个分类下的项目总数
-                try {
-                    screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    // 按天统计：组织内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                latch.countDown();
-                log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
                 //治理能力排行screen_govern_rank_data
                 try {
-                    governRankDataExtractService.extractGridDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        governRankDataExtractService.extractGridDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
-                    extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
-                    extractFactGridGovernDailyFromDTO.setDateId(dateId);
-                    factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
-                } catch (Exception e) {
-                    log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
+                        extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
+                        extractFactGridGovernDailyFromDTO.setDateId(dateId);
+                        factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+                    } catch (Exception e) {
+                        log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    try {
+                        factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    extractPartData(customerId, dateId);
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                extractPartData(customerId, dateId);
-                latch.countDown();
-                log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             try {
                 latch.await();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index d8e591ea31..fcdcf05349 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -163,7 +163,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         baseDao.insert(screenProjectDataEntity);
-        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity))
+        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity));
         //插入该项目图片表
         String[] projectImgUrl = item.getProjectImgUrl();
         if (ArrayUtils.isNotEmpty(projectImgUrl)) {
@@ -174,7 +174,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 screenProjectImgDataEntity.setProjectId(item.getProjectId());
                 screenProjectImgDataEntity.setProjectImgUrl(projectImgUrl[i]);
                 screenProjectImgDataEntity.setSort(i);
-                imgList.add(screenProjectImgDataEntity)
+                imgList.add(screenProjectImgDataEntity);
             }
             screenProjectImgDataDao.insertBatch(imgList);
         }
@@ -359,8 +359,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 if ("external".equals(categoryEntity.getCustomerType())) {
                     entity.setCategoryCode(categoryEntity.getEpmetCategoryCode());
                     CustomerProjectCategoryDictEntity parent = customerProjectCategoryDictService.getByCategoryCode(parentCustomer.getData(), categoryEntity.getEpmetCategoryCode());
-                    entity.setParentCategoryCode(parent.getParentCategoryCode());
-                    entity.setLevel(parent.getLevel());
+                    if (null != parent) {
+                        entity.setParentCategoryCode(parent.getParentCategoryCode());
+                        entity.setLevel(parent.getLevel());
+                    } else {
+                        log.error("未找到对应分类");
+                    }
                 } else {
                     entity.setCategoryCode(categoryEntity.getCategoryCode());
                     entity.setParentCategoryCode(categoryEntity.getParentCategoryCode());