From 7e69f5be5e77eab72cae4048353b0606c74e7b5d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 09 四月 2025 08:38:20 +0800 Subject: [PATCH] just comments --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java index ead4005..15f6542 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java @@ -105,21 +105,25 @@ if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) { // do nothing } else if ( roomDO.getOpType() == 2 ) { - roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType()); + roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType()); } } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_ONLY.getCallingScreenType()) { if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) { // do nothing } else if ( roomDO.getOpType() == 2 ) { - roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType()); + roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType()); } } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType()) { - if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) { - roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType()); + if ( roomDO.getOpType() == 0 ) { + roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType()); + } else if ( roomDO.getOpType() == 1 ) { + roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType()); } else if ( roomDO.getOpType() == 2 ) { // do nothing } - } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.HYBRID.getCallingScreenType()) { + } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType()) { + // do nothing + } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType()) { // do nothing } } @@ -137,7 +141,7 @@ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>(); bedStatusEnumList.add(BedStatusEnum.OPENING); bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON); - bedStatusEnumList.add(BedStatusEnum.PAUSE); + bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE); return roomMapper.simpleRoomList(bedStatusEnumList); } -- Gitblit v1.9.3