From e36c1e2363e36a69a3cc8ccbc00d28b16f926abd Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 07 十一月 2024 14:38:57 +0800 Subject: [PATCH] 序号表操作 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 201 insertions(+), 11 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java index 7e18a19..521e266 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java @@ -4,10 +4,10 @@ import java.util.concurrent.*; import javax.annotation.Resource; +import cn.lihu.jh.module.ecg.Utils; import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO; import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO; import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper; -import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper; import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper; import cn.lihu.jh.module.ecg.enums.DevRentStateEnum; import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi; @@ -27,7 +27,7 @@ import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.util.object.BeanUtils; -import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper; +import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.lihu.jh.framework.common.pojo.CommonResult.error; @@ -50,7 +50,7 @@ private OAuth2TokenApi oAuth2TokenApi; @Resource - private queueMapper queueMapper; + private QueueMapper queueMapper; @Resource private RoomMapper roomMapper; @@ -62,6 +62,8 @@ private DevRentMapper devRentMapper; ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor(); + + ConcurrentHashMap<String, RoomDO> mapRoomBed = new ConcurrentHashMap<>(); @Override public Integer createqueue(QueueSaveReqVO createReqVO) { @@ -219,6 +221,25 @@ } @Override + public ErrorCode startNextInstallPatient(Long roomId, String bedNo) { + Future<ErrorCode> future = singleThreadExecutor.submit( + new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo) + ); + + try { + ErrorCode ret = future.get(); + return ret; + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + + System.out.println("startNextInstallPatient ========"); + return ECG_INNER_ERROR; + } + + @Override public void startHurryUpOneBed(Long roomId, String bedNo) { singleThreadExecutor.execute( () -> { queueServiceTxFunctions.hurryupOneBed(roomId, bedNo); @@ -302,32 +323,92 @@ DevRentDO devRent = BeanUtils.toBean(queueSaveReqVO, DevRentDO.class); devRent.setState( DevRentStateEnum.FREE.getState() ); + devRent.setPatDetails( queueSaveReqVO.getPatDetails() ); devRentMapper.insert(devRent); - startHurryUpOneCheckType(Integer.valueOf(queue.getBookCheckType())); + startHurryUpOneCheckType( queue.getBookCheckType() ); } + // 甯歌妫�鏌� 鍙彿 + @Override public void finishNextPatient(Long roomId, String bedNo) { // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴� - Integer ret = queueMapper.updateQueueStatus(roomId, bedNo, - QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus()); + //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, + // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus()); + + // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣� + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus()); + Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList); + if ( num != null && num > 0) + return; startNextPatient(roomId, bedNo); } + // 棰嗙敤 鍙彿 + @Override + public void finishReceiveNextPatient(Long roomId, String bedNo) { + // 浠� DB 鎶� [灏辫瘖涓璢 鐨勪汉 璁剧疆涓� 銆愬凡棰嗙敤銆� + //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, + // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus()); + + // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣� + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus()); + Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList); + if ( num != null && num > 0) + return; + + startNextPatient(roomId, bedNo); + } + + // 瑁呮満 鍙彿 + @Override + public void finishInstallNextPatient(Long roomId, String bedNo) { + // 浠� DB 鎶� [瀹夎涓璢 鐨勪汉 璁剧疆涓� [宸插氨璇奭 + //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, + // QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus()); + + // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣� + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus()); + Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList); + if ( num != null && num > 0) + return; + + startNextInstallPatient(roomId, bedNo); + } + public void passNextPatient(Long roomId, String bedNo) { // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓鸿繃鍙� - Integer ret = queueMapper.updateQueueStatus(roomId, bedNo, + Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus()); startNextPatient(roomId, bedNo); } - public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) { - List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, statusList); + @Override + public void passInstallNextPatient(Long roomId, String bedNo) { + // 浠� DB 鎶� [瀹夎涓璢鐨勪汉 璁剧疆涓� [杩囧彿-瀹夎] + Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, + QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus()); + + startNextPatient(roomId, bedNo); + } + + public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList) { + List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList); return queueDOList; } + @Override + public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList) { + List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList); + return queueDOList; + } + + // 甯歌妫�鏌� 鍖荤敓鐣岄潰鐨勭粺璁′俊鎭� public PatientStatisticVO getPatientStatistic(Long roomId, String bedNo) { PatientStatisticVO patientStatisticVO = new PatientStatisticVO(); List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo); @@ -341,9 +422,70 @@ } }); - List<Byte> statusList = new ArrayList<>(); + // 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲� + RoomDO roomDO = getRoomDO(roomId, bedNo); + Integer[] checkTypes = roomDO.getCheckTypes(); + List<Integer> statusList = new ArrayList<>(); statusList.add(QueueStatusEnum.WAITING.getStatus()); - Integer num = queueMapper.statusStatistic(statusList); + Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList); + patientStatisticVO.setQueuingNum(num); + + return patientStatisticVO; + } + + public PatientStatisticVO getBedDevInstallStatistic(Long roomId, String bedNo) { + PatientStatisticVO patientStatisticVO = new PatientStatisticVO(); + List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo); + bedQueueStatisticDOList.forEach(item -> { +// } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) { +// patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() ); + if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) { + patientStatisticVO.setFinishedNum(item.getTotalInStatus()); + } + }); + + // 瑁呮満鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎宸ヤ綅鐪嬩笉鍒� [宸查鐢╙ 鎮h�咃紝鎵�浠ユ棤娉曟牴鎹鏈哄伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻 + patientStatisticVO.setReceivedNum( 0 ); + List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId); + roomQueueStatisticDOList.forEach(item -> { + if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) { + patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() ); + } + }); + + return patientStatisticVO; + } + + public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) { + PatientStatisticVO patientStatisticVO = new PatientStatisticVO(); + List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo); + bedQueueStatisticDOList.forEach(item -> { + if (QueueStatusEnum.READY.getStatus() == item.getStatus()) { + patientStatisticVO.setReadyNum(item.getTotalInStatus()); + } else if (QueueStatusEnum.PASSED.getStatus() == item.getStatus()) { + patientStatisticVO.setPassedNum(item.getTotalInStatus()); + } + }); + + // 棰嗙敤鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎鏃舵偅鑰呭綊灞炲伐浣嶄粠棰嗙敤宸ヤ綅鍙樻洿鍒板畨瑁呭伐浣嶏紝鎵�浠ユ棤娉曟牴鎹鐢ㄥ伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻 + patientStatisticVO.setReceivedNum( 0 ); + List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId); + roomQueueStatisticDOList.forEach(item -> { + if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) { + patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() ); + } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) { + patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() ); + } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) { + patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus() ); + } + }); + + // 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲� + RoomDO roomDO = getRoomDO(roomId, bedNo); + Integer[] checkTypes = roomDO.getCheckTypes(); + List<Integer> statusList = new ArrayList<>(); + statusList.add(QueueStatusEnum.WAITING.getStatus()); + Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList); patientStatisticVO.setQueuingNum(num); return patientStatisticVO; @@ -375,6 +517,15 @@ } @Override + public Integer recallInstallPatient(Long roomId, String bedNo, String patId) { + Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo, patId, + QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()); + // 瀹夎宸ヤ綅 涓嶈璁� 浼樺厛闃熷垪 + //startHurryUpOneBed(roomId, bedNo); + return updateNum; + } + + @Override public Integer patientJump(String patId, Byte jumped) { Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped); @@ -388,4 +539,43 @@ return roomMapper.getRoomByDocId(docId); } + /** + * 鑾峰彇 鎸囧畾宸ヤ綅 寰呮鏌寰呴鐢ㄧ殑浜� + * @param roomId + * @param bedNo + * @return + */ + @Override + public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) { + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.RECALLED.getStatus()); + queueStatusList.add(QueueStatusEnum.READY.getStatus()); + queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus()); + queueStatusList.add(QueueStatusEnum.PASSED.getStatus()); + List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList); + return queueDOList; + } + + @Override + public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) { + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus()); + queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus()); + List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList); + + queueStatusList.clear(); + queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus()); + queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus()); + queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList) ); + return queueDOList; + } + + private RoomDO getRoomDO(Long roomId, String bedNo) { + RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if ( null == roomDO) + roomDO = roomMapper.getRoom(roomId, bedNo); + + return roomDO; + } + } -- Gitblit v1.9.3