diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index c31a7dfcd..43b55bd3a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -569,6 +569,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             deptLevel.setLeaderName(leaderName);
         }
 
+        redisUtils.set(RedisKeys.getDeptOptionKey(deptId), deptLevel);
         return deptLevel;
     }
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 427d3001a..c5a45f95b 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -139,6 +139,13 @@ public class RedisKeys {
         return rootPrefix.concat("options:dept:user:").concat(String.valueOf(userId));
     }
 
+    /**
+     * 部门关系
+     */
+    public static String getDeptOptionKey(Long deptId) {
+        return rootPrefix.concat("options:dept:all:").concat(String.valueOf(deptId));
+    }
+
     /**
      * 事件分类
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index d40799152..e7212841d 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -37,27 +37,6 @@ public interface AdminFeignClient {
     @PostMapping(value = "sys/dept/queryUserSysDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO);
 
-    /**
-     * @param id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
-     * @Author yinzuomei
-     * @Description 根据部门id获取部门信息
-     * @Date 2019/12/6 20:22
-     **/
-    @GetMapping("/sys/dept/{id}")
-    Result<SysDeptDTO> getSysDeptDTO(@PathVariable("id") Long id);
-
-
-    /***
-     * 查询所有网格
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author qushutong
-     * @date 2019/12/12 17:16
-     */
-    @GetMapping("/sys/dept/listAllGridId")
-    Result<List<Long>> listAllGridId();
-
     /**
      * 按部门类型，分页查询部门列表
      *
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index e38fed3f1..d7ce5082e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -32,30 +32,6 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO);
     }
 
-    /**
-     * @param id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
-     * @Author yinzuomei
-     * @Description 根据部门id获取部门信息
-     * @Date 2019/12/6 20:22
-     **/
-    @Override
-    public Result<SysDeptDTO> getSysDeptDTO(Long id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id);
-    }
-
-    /***
-     * 获取所有网格
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
-     * @author qushutong
-     * @date 2019/12/12 19:03
-     */
-    @Override
-    public Result<List<Long>> listAllGridId() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", "");
-    }
-
     @Override
     public Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "pageDeptIdByTypeKey", typeKey, pageSize, pageIndex);
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
index b32fa2455..6d58c6962 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
@@ -1,19 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 
 package com.elink.esua.epdc.service.impl;
 
@@ -50,6 +34,7 @@ import com.elink.esua.epdc.enums.KpiCycleEnum;
 import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.KpiManualScoreService;
+import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
@@ -75,15 +60,22 @@ import java.util.*;
 public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao, KpiManualScoreEntity> implements KpiManualScoreService {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
+
     @Autowired
     private KpiManualScoreRuleDao kpiManualScoreRuleDao;
+
     @Autowired
     private KpiRuleDao kpiRuleDao;
+
     @Autowired
     private AdminFeignClient adminFeignClient;
+
     @Autowired
     private KpiResultGridDao kpiResultGridDao;
 
+    @Autowired
+    private DeptUtils deptUtils;
+
     @Override
     public PageData<KpiManualScoreDTO> page(Map<String, Object> params) {
         String ruleId = params.containsKey("ruleId") ? params.get("ruleId").toString() : null;
@@ -128,7 +120,6 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         String scoreStartMonth = params.get("scoreStartDate").toString();
         // 考核周期开始月
         YearMonth scoreStartDateMonth = YearMonth.parse(scoreStartMonth);
-
         // 考核规则
         KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId);
         // 考核周期
@@ -192,10 +183,8 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         String scoreStartMonth = params.get("scoreStartDate").toString();
         // 考核周期开始月
         YearMonth scoreStartDateMonth = YearMonth.parse(scoreStartMonth);
-
         // 考核规则
         KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId);
-
         // 考核周期结束日
         LocalDate scoreEndDate;
         // 考核周期赋值
@@ -397,12 +386,9 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
 
         YearMonth scoreStartMonth = LocalDateUtils.dateToYearMonth(dto.getScoreStartMonth());
 
-        // 考核部门基本信息
-        Result<SysDeptDTO> sysDeptDTOResult = adminFeignClient.getSysDeptDTO(Long.valueOf(dto.getDeptId()));
-        if (!sysDeptDTOResult.success()) {
-            return new Result().error(sysDeptDTOResult.getMsg());
-        }
-        if (!kpiManualScoreRuleEntity.getDeptTypeKey().equals(sysDeptDTOResult.getData().getTypeKey())) {
+        DeptLevelAndLeaderDTO deptLevel = deptUtils.getDeptLevelInfo(dto.getDeptId(), YesOrNoEnum.YES);
+
+        if (!kpiManualScoreRuleEntity.getDeptTypeKey().equals(deptLevel.getTypeKey())) {
             return new Result().error("所选部门不在当前规则考核范围内");
         }
 
@@ -422,11 +408,6 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
             dto.setScoreEndDate(LocalDateUtils.localDateToDate(scoreStartMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth()));
         }
 
-        Result<DeptLevelAndLeaderDTO> adminResult = adminFeignClient.getDeptInfoById(dto.getDeptId(), YesOrNoEnum.YES.value());
-        if (!adminResult.success()) {
-            return new Result().error(adminResult.getMsg());
-        }
-        DeptLevelAndLeaderDTO deptLevel = adminResult.getData();
         dto.setAllDeptNames(deptLevel.getAllDeptNames());
         dto.setAllDeptIds(deptLevel.getAllDeptIds());
         dto.setParentDeptNames(deptLevel.getParentDeptNames());
@@ -435,6 +416,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         UserDetail user = SecurityUser.getUser();
         dto.setCreatorDeptId(user.getDeptId());
         dto.setCreatorDeptName(user.getDeptName());
+
         KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class);
 
         baseDao.delete(getUniqueWrapper(entity));
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java
new file mode 100644
index 000000000..bd66d0be2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java
@@ -0,0 +1,54 @@
+package com.elink.esua.epdc.utils;
+
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author work@yujt.net.cn
+ * @date 2019/12/18 14:52
+ */
+@Component
+public class DeptUtils {
+
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    /**
+     * 获取部门信息
+     *
+     * @param deptId  部门id
+     * @param yesOrNo 是否需要获取网格长姓名
+     * @return com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO
+     * @author work@yujt.net.cn
+     * @date 2019/12/18 15:02
+     */
+    public DeptLevelAndLeaderDTO getDeptLevelInfo(Long deptId, YesOrNoEnum yesOrNo) {
+        DeptLevelAndLeaderDTO dto = (DeptLevelAndLeaderDTO) redisUtils.get(RedisKeys.getDeptOptionKey(deptId));
+
+        if (null != dto) {
+            if (YesOrNoEnum.NO.value().equals(yesOrNo.value())) {
+                return dto;
+            } else {
+                if (StringUtils.isNotBlank(dto.getLeaderName())) {
+                    return dto;
+                }
+            }
+        }
+        Result<DeptLevelAndLeaderDTO> result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value());
+        if (!result.success() || result.getData() == null) {
+            throw new RenException("获取机构信息失败");
+        }
+        return result.getData();
+    }
+}