From 6a4f07eaef8e64602c454975b607e36ac1d51776 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 31 三月 2025 11:15:39 +0800 Subject: [PATCH] 诊间屏类型 新增 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 68554a7..ead4005 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 @@ -90,10 +90,14 @@ roomProfile.setRoomName(roomDO.getRoomName()); roomProfile.setBedNum( roomProfile.getBedNum() + 1); + // 0 妫�鏌� 1 棰嗙敤 2 瑁呮満 + // 璁$畻 璇婇棿灞忕被鍨� if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.NONE.getCallingScreenType()) { - if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) { - roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_ONLY.getCallingScreenType()); + if ( roomDO.getOpType() == 0 ) { + roomProfile.setCallingScreenType(RoomCallingScreenEnum.CHECK_ONLY.getCallingScreenType()); + } else if ( roomDO.getOpType() == 1 ) { + roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_ONLY.getCallingScreenType()); } else if ( roomDO.getOpType() == 2 ) { roomProfile.setCallingScreenType( RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType()); } @@ -103,6 +107,12 @@ } else if ( roomDO.getOpType() == 2 ) { roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.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()); + } } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType()) { if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) { roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType()); -- Gitblit v1.9.3