诊间屏 测试支持

eight

2025-04-09 d37e1f573a732c6138c53e3e15db616a671367ad

诊间屏  测试支持

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java

@@ -88,9 +88,9 @@
    @GetMapping("/get-room-by-ip")
    @Operation(summary = "获得诊室和诊疗床")
    @PermitAll
    public CommonResult<RoomProfileRespVO> getRoomByIP(HttpServletRequest request) {
    public CommonResult<RoomProfileRespVO> getRoomByIP(HttpServletRequest request, @RequestParam(value = "roomId", required = false) Long roomId) {
        String reqIp = ServletUtil.getClientIP(request);
        RoomProfile roomProfile = roomService.getRoomByIP(reqIp);
        RoomProfile roomProfile = roomService.getRoomByIP(reqIp, roomId);
        return success(BeanUtils.toBean(roomProfile, RoomProfileRespVO.class));
    }


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java

@@ -47,7 +47,7 @@
     */
    RoomDO getRoom(Integer id);

    RoomProfile getRoomByIP(String ip);
    RoomProfile getRoomByIP(String ip, Long roomId);

    /**
     * 获得诊室和诊疗床分页

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java

@@ -78,8 +78,13 @@
    }

    @Override
    public RoomProfile getRoomByIP(String ip) {
        List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
    public RoomProfile getRoomByIP(String ip, Long roomId) {
        List<RoomDO> roomDOList = null;
        if (null != roomId) {
            roomDOList = roomMapper.selectList(RoomDO::getRoomId, roomId);
        } else {
            roomDOList = roomMapper.queueByIp(ip);
        }

        RoomProfile roomProfile = new RoomProfile();
        roomProfile.setBedNum( 0 );