diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoResultDTO.java
index 7bf08545a..16d51a1ed 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoResultDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoResultDTO.java
@@ -57,4 +57,9 @@ public class UserSysDeptInfoResultDTO implements Serializable {
 	 * 网格
 	 */
 	private String grid;
+
+	/**
+	 * 部门类型键值
+	 */
+	private String typeKey;
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index cdfe26a50..4c0113e05 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -280,4 +280,18 @@ public class SysDeptController {
         DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag);
         return new Result<DeptLevelAndLeaderDTO>().ok(dto);
     }
+
+    /**
+     * @Description: 获取全部的部门基本信息
+     * @Param: [userSysDeptInfoFormDTO]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-14
+     */
+    @PostMapping("queryAllDeptInfo")
+    public Result<List<UserSysDeptInfoResultDTO>> queryAllDeptInfo(@RequestBody UserSysDeptInfoFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        List<UserSysDeptInfoResultDTO> list = sysDeptService.listAllDeptInfo(formDTO);
+        return new Result<List<UserSysDeptInfoResultDTO>>().ok(list);
+    }
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 8193bca28..57b3c313c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -192,4 +192,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @date 2019/12/18 13:45
      */
     String selectDeptLeaderName(@Param("deptId") Long deptId, @Param("roleType") String roleType);
+
+    /**
+     * @Description: 获取全部的部门基本信息
+     * @Param: [userSysDeptInfoFormDTO]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-14
+     */
+    List<UserSysDeptInfoResultDTO> selectListAllDeptInfoo(UserSysDeptInfoFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index dd0b5b198..c3059bd02 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -258,4 +258,13 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
     DeptOption getStreetByLoginUser();
 
     DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag);
+
+    /**
+     * @Description: 获取全部的部门基本信息
+     * @Param: [userSysDeptInfoFormDTO]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-14
+     */
+    List<UserSysDeptInfoResultDTO> listAllDeptInfo(UserSysDeptInfoFormDTO formDTO);
 }
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 a7e54abf8..db941cb8e 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
@@ -896,6 +896,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return deptLevel;
     }
 
+    @Override
+    public List<UserSysDeptInfoResultDTO> listAllDeptInfo(UserSysDeptInfoFormDTO formDTO) {
+        List<UserSysDeptInfoResultDTO> list = baseDao.selectListAllDeptInfoo(formDTO); // 获取全部的部门信息
+        return list;
+    }
+
     /**
      *
      * 组织机构名称修改发送MQ消息
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index d316d0c1f..509373d42 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -273,4 +273,39 @@
         </if>
         order by gri.create_date desc
     </select>
+
+    <select id="selectListAllDeptInfoo" parameterType="com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO"
+            resultType="com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO">
+        SELECT
+        sd.id,
+        sd.NAME,
+        sd.pid,
+        p.NAME AS parentName,
+        sd.pids,
+        sd.type_key,
+        NULL AS parentNames,
+        null as street,
+        null as community,
+        (case
+        when sd.type_key='grid_party' then sd.name
+        else null
+        end) as grid
+        FROM
+        sys_dept sd
+        LEFT JOIN sys_dept p ON ( sd.pid = p.id )
+        WHERE
+        sd.del_flag = '0'
+        <if test="typeKeyList!=null and  typeKeyList.size()>0">
+            AND sd.type_key in
+            <foreach collection="typeKeyList" item="typeKey" index="index" open="(" close=")" separator=",">
+                #{typeKey}
+            </foreach>
+        </if>
+        <if test="deptIdList!=null and  deptIdList.size()>0">
+            AND sd.pid IN
+            <foreach collection="deptIdList" item="deptId" index="index" open="(" close=")" separator=",">
+                #{deptId}
+            </foreach>
+        </if>
+    </select>
 </mapper>
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 6d16111c7..cddf6b7c2 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
@@ -63,4 +63,13 @@ public interface AdminFeignClient {
     Result<DeptLevelAndLeaderDTO> getDeptInfoById(@PathVariable("deptId") Long deptId,
                                                   @PathVariable("leaderFlag") String leaderFlag);
 
+    /** 
+     * @Description: 获取全部的部门基本信息 
+     * @Param: [userSysDeptInfoFormDTO] 
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>> 
+     * @Author: zy 
+     * @Date: 2020-04-14 
+     */ 
+    @PostMapping(value = "sys/dept/queryAllDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<UserSysDeptInfoResultDTO>> queryAllDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
index a9ddca914..a24f5056b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
@@ -186,13 +186,17 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
         String deptType = params.get("deptType").toString();
         // yyyy-MM
         String month = params.get("month").toString();
+
+        // 用户所选部门id
+        List<Long> dataScopeDeptList = new ArrayList<>();
+        if (!("".equals(params.get("deptId")))){
+            long deptId = Long.valueOf(params.get("deptId").toString()).longValue();
+            dataScopeDeptList.add(deptId);
+        }
         // 考核周期开始月
         YearMonth scoreStartDateMonth = YearMonth.parse(month);
 
-        // 用户拥有的所有部门权限
-        List<Long> dataScopeDeptList = SecurityUser.getUser().getDeptIdList();
-        Result<List<UserSysDeptInfoResultDTO>> result = queryUserSysDeptInfo(dataScopeDeptList, deptType);
-
+        Result<List<UserSysDeptInfoResultDTO>> result = querySysDeptInfo(dataScopeDeptList, deptType);
         if (!result.success() || CollUtil.isEmpty(result.getData())) {
             return Lists.newArrayList();
         }
@@ -203,19 +207,14 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
 
             ManualScoreDTO manualScoreDTO = new ManualScoreDTO();
 
-            if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(params.get("deptType").toString())){
+            if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(params.get("deptType").toString())){
                 deptType = "街道";
-                manualScoreDTO.setDeptName(userSysDeptInfoResultDTO.getStreet());
             } else if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(params.get("deptType").toString())){
                 deptType = "社区";
-                manualScoreDTO.setDeptName(userSysDeptInfoResultDTO.getStreet() + "-" +
-                        userSysDeptInfoResultDTO.getName());
             } else if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(params.get("deptType").toString())){
                 deptType = "网格";
-                manualScoreDTO.setDeptName(userSysDeptInfoResultDTO.getStreet() + "-" +
-                        userSysDeptInfoResultDTO.getCommunity() + "-" + userSysDeptInfoResultDTO.getGrid());
             }
-
+            manualScoreDTO.setDeptName(userSysDeptInfoResultDTO.getName());
             manualScoreDTO.setDeptType(deptType);
             if ("0".equals(params.get("scoreType").toString())){
                 manualScoreDTO.setScoreType("月");
@@ -293,7 +292,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
      * @Author: zy
      * @Date: 2020-04-14
      */
-    private Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(List<Long> dataScopeDeptList, String deptTypeKey) {
+    private Result<List<UserSysDeptInfoResultDTO>> querySysDeptInfo(List<Long> dataScopeDeptList, String deptTypeKey) {
 
         UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO();
 
@@ -303,7 +302,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
 
         userSysDeptInfoFormDTO.setDeptIdList(dataScopeDeptList);
 
-        return adminFeignClient.queryUserSysDeptInfo(userSysDeptInfoFormDTO);
+        return adminFeignClient.queryAllDeptInfo(userSysDeptInfoFormDTO);
     }
 
     /**