修改bug

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomDynamicServiceImpl.java

@@ -10,6 +10,7 @@ import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.entity.platform.space.PlatRoomBedDevice;
 import com.makeit.entity.platform.space.PlatRoomBedDevice;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.enums.platform.space.PlatBedPanoramaSpaceType;
 import com.makeit.enums.platform.space.PlatBedPanoramaSpaceType;
+import com.makeit.enums.platform.space.PlatBedStatusEnum;
 import com.makeit.enums.platform.space.PlatRoomStatusEnum;
 import com.makeit.enums.platform.space.PlatRoomStatusEnum;
 import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.service.platform.space.*;
 import com.makeit.service.platform.space.*;
@@ -59,6 +60,7 @@ public class PlatRoomDynamicServiceImpl implements PlatRoomDynamicService {
             Map<String,List<PlatRoom>> spaceRoomMap = rooms.stream().collect(Collectors.groupingBy(PlatRoom::getSpaceId));
             Map<String,List<PlatRoom>> spaceRoomMap = rooms.stream().collect(Collectors.groupingBy(PlatRoom::getSpaceId));
             List<String> roomIds = rooms.stream().map(PlatRoom::getId).collect(Collectors.toList());
             List<String> roomIds = rooms.stream().map(PlatRoom::getId).collect(Collectors.toList());
             List<PlatBed> beds = platBedService.list(new QueryWrapper<PlatBed>().lambda()
             List<PlatBed> beds = platBedService.list(new QueryWrapper<PlatBed>().lambda()
+                    .eq(PlatBed::getStatus, PlatBedStatusEnum.BedStatusEnum.CHECKED_IN)
                     .in(PlatBed::getRoomId,roomIds));
                     .in(PlatBed::getRoomId,roomIds));
             Map<String,List<PlatBed>> bedMap = beds.stream().collect(Collectors.groupingBy(PlatBed::getRoomId));
             Map<String,List<PlatBed>> bedMap = beds.stream().collect(Collectors.groupingBy(PlatBed::getRoomId));
             for(PlatSpace space : spaces){
             for(PlatSpace space : spaces){

server-service/src/main/java/com/makeit/vo/platform/space/PlatRoomVO.java

@@ -27,7 +27,7 @@ public class PlatRoomVO {
     @ApiModelProperty("房间床位使用数")
     @ApiModelProperty("房间床位使用数")
     private Integer usedTotal;
     private Integer usedTotal;
 
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态 1-空闲 2-未住满 3-已住满")
     private String roomStatus;
     private String roomStatus;
 
 
 }
 }