From 62f50c418492d3b3240977d899e6c8a867bafdf1 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 17 Jun 2022 15:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=BD=91=E6=A0=BC=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java  | 1 +
 .../personroom/controller/BuildingUnitController.java       | 6 ------
 .../resources/mapper/personroom/EpidemicBuildingUnitDao.xml | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index dae2544..c81cca8 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -202,6 +202,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         // 查询房屋关联信息
         EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
         formDTO.setIdCard(result.getIdCard());
+        formDTO.setGridId(result.getDeptId().toString());
         EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
         if (unitInfo != null) {
             result.setUnitId(unitInfo.getId());
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 1326454..532d567 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
@@ -147,12 +147,6 @@ public class BuildingUnitController {
         return new Result<List<DictOptionDTO>>().ok(list);
     }
 
-    @GetMapping("getUnitInfo")
-    public Result<EpidemicBuildingUnitDetailResultDTO> getUnitInfo(EpidemicBuildingUnitDTO formDTO) {
-        EpidemicBuildingUnitDetailResultDTO dto = epidemicBuildingUnitService.getUnitInfo(formDTO);
-        return new Result<EpidemicBuildingUnitDetailResultDTO>().ok(dto);
-    }
-
     /**
      * 房间号下拉框
      *
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 5ebf1f5..d586d14 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
@@ -292,6 +292,7 @@
             LEFT JOIN epidemic_plot_coordinate pc ON pb.PLOT_ID = pc.ID
         WHERE
             o.ID_CARD = #{idCard}
+            AND pc.GRID_ID = #{gridId}
         ORDER BY
             CREATED_TIME DESC
             LIMIT 1