diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
index 3b9a5f0..678175f 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
@@ -18,8 +18,6 @@
 package com.elink.esua.epdc.vaccine.personroom.controller;
 
 
-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;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -32,23 +30,15 @@ import com.elink.esua.epdc.config.QrCodeProperties;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
-import com.elink.esua.epdc.vaccine.epidemic.utils.HouseQRcodeUtils;
 import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicBuildingUnitExcel;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -199,9 +189,9 @@ public class BuildingUnitController {
      * @params [loginUser, formDTO, response]
      */
     @PostMapping("downloadZip")
-    public void downloadZip(HttpServletResponse response) throws Exception {
-        epidemicBuildingUnitService.downloadZip(response);
-
+    public void downloadZip(@RequestBody HouseQrcodeZipFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(formDTO);
+        epidemicBuildingUnitService.downloadZip(formDTO,response);
     }
 
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
index 4eecd47..c2b4def 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
@@ -22,6 +22,8 @@ import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO;
@@ -74,12 +76,12 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
     /**
      * 展示所有包含房屋码的数据
      *
-     * @param
+     * @param formDTO
      * @return java.util.List<io.pingyin.modules.personroom.dto.EpidemicBuildingUnitDTO>
      * @author zhy
      * @date 2022/4/6 17:22
      */
-    List<EpidemicBuildingUnitDTO> listUnitHasCode();
+    List<EpidemicBuildingUnitDTO> listUnitHasCode(HouseQrcodeZipFormDTO formDTO);
 
     /**
      * 获取详情
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
index 031ac45..2a6c3d6 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
@@ -22,9 +22,9 @@ import com.elink.esua.epdc.commons.mybatis.service.CrudService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
-import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
@@ -186,7 +186,7 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      * @date 2022/5/31 18:00
      * @params [formDTO]
      */
-    void downloadZip(HttpServletResponse response) throws Exception;
+    void downloadZip(HouseQrcodeZipFormDTO formDTO, HttpServletResponse response) throws Exception;
 
     /**
      * 实时生成一户一码
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 b3d61a7..c9d333b 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
@@ -38,6 +38,8 @@ import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.*;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
@@ -390,7 +392,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
     }
 
     @Override
-    public void downloadZip(HttpServletResponse response) throws Exception {
+    public void downloadZip(HouseQrcodeZipFormDTO formDTO, HttpServletResponse response) throws Exception {
         //response
         response.reset();
         //文件的名称
@@ -403,7 +405,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
         ZipOutputStream zip = new ZipOutputStream(response.getOutputStream());
 
-        List<EpidemicBuildingUnitDTO> houseList = baseDao.listUnitHasCode();
+        List<EpidemicBuildingUnitDTO> houseList = baseDao.listUnitHasCode(formDTO);
         String urlPre = qrCodeProperties.getPre();
 
         for (EpidemicBuildingUnitDTO house : houseList) {
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 5f76bfa..e3f36ac 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
@@ -115,6 +115,7 @@
         LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id
         WHERE
         u.DEL_FLAG = '0'
+        AND u.GRID_ID = #{gridId}
         AND u.ROOM_CODE IS NOT NULL
     </select>