diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
index 9e2e3c74a9..6dc17c3e48 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
@@ -32,4 +32,9 @@ public class AgencyNumTypeParamFormDTO implements Serializable {
     @NotBlank(message = "类型不能为空", groups = AgencyNumTypeParamGroup.class)
     private String type;
 
+    /**
+     * 地区编码
+     */
+    private String areaCode;
+
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
index 5a0a566342..8041e34caa 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
@@ -42,6 +42,15 @@ public interface ScreenDifficultyDataDao {
     **/
     List<DifficultProjectResultDTO> selectDifficulty(@Param("agencyId")String agencyId,@Param("type")String type);
 
+    /**
+     * @Description  查询难点赌点-耗时最长|涉及部门最多|处理次数【new】
+     * @Param orgIds
+     * @Param type
+     * @author zxc
+     * @date 2021/2/25 下午6:41
+     */
+    List<DifficultProjectResultDTO> selectDifficultyNew(@Param("orgIds")List<String> orgIds,@Param("type")String type);
+
     ProjectDetailResultDTO projectDetail(@Param("eventId")String projectId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index 081f7aa28e..e6044d6aec 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -8,6 +8,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.*;
+import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService;
 import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
@@ -58,6 +59,9 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
     private OperCrmOpenFeignClient crmClient;
     @Autowired
     private ScreenCustomerAgencyDao agencyDao;
+    @Autowired
+    private AgencyService screenCustomerAgencyService;
+
 
     /**
      * @Description 1、热心市民积分排行
@@ -100,11 +104,16 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<DifficultProjectResultDTO> difficultProject(AgencyNumTypeParamFormDTO param) {
+        List<String> nextAgencyIds = screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(), param.getAgencyId());
+        if (CollectionUtils.isEmpty(nextAgencyIds)){
+            return new ArrayList<>();
+        }
         if(null == param.getTopNum()){
             param.setTopNum(NumConstant.TWO);
         }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
-        List<DifficultProjectResultDTO> result = screenDifficultyDataDao.selectDifficulty(param.getAgencyId(),param.getType());
+//        List<DifficultProjectResultDTO> result = screenDifficultyDataDao.selectDifficulty(param.getAgencyId(),param.getType());
+        List<DifficultProjectResultDTO> result = screenDifficultyDataDao.selectDifficultyNew(nextAgencyIds,param.getType());
         for(DifficultProjectResultDTO resultDTO:result){
             if (StringUtils.isNotBlank(resultDTO.getImgUrl()) && !resultDTO.getImgUrl().contains("http")) {
                 resultDTO.setImgUrl(StrConstant.EPMETY_STR);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index dc1320fa4d..59abb0b764 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -52,4 +52,28 @@
             AND dd.EVENT_ID = #{eventId}
     </select>
 
+    <!-- 查询难点赌点-耗时最长|涉及部门最多|处理次数【new】 -->
+    <select id="selectDifficultyNew" resultType="com.epmet.evaluationindex.screen.dto.result.DifficultProjectResultDTO">
+        SELECT
+            diff.EVENT_ID AS projectId,
+            diff.EVENT_CONTENT AS title,
+            diff.EVENT_STATUS_CODE AS STATUS,
+            ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours,
+            diff.EVENT_SOURCE AS gridName,
+            diff.EVENT_IMG_URL AS imgUrl,
+            IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName,
+            diff.EVENT_RE_ORG AS handleDepts,
+            diff.EVENT_RE_ORG AS handleCount
+        FROM
+            screen_difficulty_data diff
+        WHERE
+            diff.DEL_FLAG = '0'
+          AND (
+              <foreach collection="orgIds" item="id" separator=" OR ">
+                  diff.ALL_PARENT_IDS LIKE CONCAT('%',#{id},'%')
+              </foreach>
+            )
+        ORDER BY (CASE #{type} WHEN 'timelongest' THEN diff.EVENT_COST_TIME WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT ELSE diff.EVENT_RE_ORG  END) DESC
+    </select>
+
 </mapper>
\ No newline at end of file