排除新增的房屋

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

@@ -809,7 +809,21 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                             String showCode = getRoomCodeShow(buildingOptional.get().getId(), item.getUnit(), item.getRoomNo());
                             unitEntity.setRoomCodeShow(showCode);
                         }
+
                         updateUnitList.add(unitEntity);
+
+                        // 新增的房屋也要放到待筛选列表，后续循环便可认为该房屋是已存在的
+                        EpidemicUnitInfoResultDTO newUnit = new EpidemicUnitInfoResultDTO();
+                        newUnit.setBuildingId(buildingOptional.get().getId());
+                        newUnit.setBuildingName(buildingOptional.get().getBuildingName());
+                        newUnit.setGridId(buildingOptional.get().getGridId());
+                        newUnit.setPlotId(buildingOptional.get().getPlotId());
+                        newUnit.setPlotName(buildingOptional.get().getPlotName());
+                        newUnit.setUnit(item.getUnit().trim().toUpperCase());
+                        newUnit.setUnitId(unitEntity.getId());
+                        newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase());
+                        unitList.add(newUnit);
+
                         EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
                         entity.setIdCard(item.getIdCard());
                         entity.setUnitId(unitEntity.getId());