diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 4f4f6d4..45422f8 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 4f4f6d4e560bc4d246505399cd7c5aa86f335cca +Subproject commit 45422f80613968a587767917ae241ca4b8c0bee6 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 d826743..7190578 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 @@ -151,6 +151,15 @@ public interface EpidemicBuildingUnitDao extends BaseDao getHouseInfo(GetHouseInfoFormDTO formDTO) { HouseInfoResultDTO houseInfoResultDTO = baseDao.getHouseInfo(formDTO); - + String houseCoding = baseDao.getHouseCoding(formDTO); + if(StringUtils.isNotBlank(houseCoding)){ + houseInfoResultDTO.setRoomCodeShow(houseCoding); + } if (houseInfoResultDTO != null) { List members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId()); 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 fcbf48e..b4ac25e 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 @@ -324,6 +324,22 @@ + + +