diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
index bcc666a..5911b90 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
@@ -2,10 +2,7 @@ package com.elink.esua.epdc.vaccine.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.AllDeptDTO;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
 import com.elink.esua.epdc.vaccine.feign.fallback.VimAdminFeignClientFallback;
@@ -49,6 +46,17 @@ public interface VimAdminFeignClient {
     @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
     Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
 
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author gp
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/deptinfo/{id}")
+    Result<DeptInfoDTO> getDeptInfo(@PathVariable("id") Long id);
+
     @GetMapping("/sys/dept/getCompleteDept/{gridId}")
     Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") String gridId);
 
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java
index 034b99b..58f5595 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java
@@ -3,10 +3,7 @@ package com.elink.esua.epdc.vaccine.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.AllDeptDTO;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
 import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient;
@@ -32,6 +29,11 @@ public class VimAdminFeignClientFallback implements VimAdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
     }
 
+    @Override
+    public Result<DeptInfoDTO> getDeptInfo(Long id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfo", id);
+    }
+
     @Override
     public Result<CompleteDeptDTO> getCompleteDept(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index cfc3a6b..9969b93 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -34,6 +35,7 @@ import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.QrCodeProperties;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.DeptInfoDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
@@ -493,7 +495,30 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
         ZipOutputStream zip = new ZipOutputStream(response.getOutputStream());
 
+        // 更改为可以下载全部组织的数据，原来的gridId需要查询实际是网格还是社区街道
+        Result<DeptInfoDTO> result = adminVimFeignClient.getDeptInfo(Long.parseLong(formDTO.getGridId()));
+        if (result.success()) {
+            if (null != result.getData()) {
+                if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(result.getData().getTypeKey())) {
+                    formDTO.setGridId(result.getData().getId().toString());
+                } else if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(result.getData().getTypeKey())) {
+                    formDTO.setCommunityId(result.getData().getId().toString());
+                    formDTO.setGridId(null);
+                } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(result.getData().getTypeKey())) {
+                    formDTO.setStreetId(result.getData().getId().toString());
+                    formDTO.setGridId(null);
+                } else {
+                    throw new RenException("查询部门失败");
+                }
+            } else {
+                throw new RenException("查询部门失败");
+            }
+        } else {
+            throw new RenException("查询部门失败");
+        }
+
         List<EpidemicBuildingUnitDTO> houseList = baseDao.listUnitHasCode(formDTO);
+
         String urlPre = qrCodeProperties.getPre();
 
         for (EpidemicBuildingUnitDTO house : houseList) {
@@ -513,6 +538,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                 inputStream.close();
                 zip.closeEntry();
             } catch (IOException e) {
+                e.printStackTrace();
                 throw new RenException("组装zip失败");
             }
         }
@@ -575,7 +601,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
      * 获取文件名
      */
     public static String getFileName(EpidemicBuildingUnitDTO house) {
-        return house.getPlotName() + File.separator + house.getBuildingName() + File.separator + house.getUnit() + File.separator + house.getRoomNo() + ".png";
+        return house.getGridName() + File.separator + house.getPlotName() + File.separator + house.getBuildingName() + File.separator + house.getUnit() + File.separator + house.getRoomNo() + ".png";
     }
 
     private void saveOrUpdateOwners(List<EpidemicUnitOwnerDTO> owners, Long unitId) {
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
index 3b8b0e6..fcbf48e 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
@@ -127,7 +127,15 @@
         LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id
         WHERE
         u.DEL_FLAG = '0'
-        AND u.GRID_ID = #{gridId}
+        <if test="gridId != null and gridId !=''">
+            AND u.GRID_ID = #{gridId}
+        </if>
+        <if test="communityId != null and communityId !=''">
+            AND u.COMMUNITY_ID = #{communityId}
+        </if>
+        <if test="streetId != null and streetId !=''">
+            AND u.STREET_ID = #{streetId}
+        </if>
         AND u.ROOM_CODE IS NOT NULL
     </select>