jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java
@@ -35,12 +35,16 @@ ErrorCode DEV_INSTALL_NOT_EXISTS = new ErrorCode(1_010_006_000, "装机不存在"); ErrorCode DEV_INSTALL_EXCEPTION = new ErrorCode(1_010_006_001, "装机内部错误"); ErrorCode DEV_DISMANTLE_EXCEPTION = new ErrorCode(1_010_006_002, "拆机内部错误"); ErrorCode DEV_CANCEL_EXCEPTION = new ErrorCode(1_010_006_003, "取消装机内部错误"); ErrorCode ROUTINE_CANCEL_EXCEPTION = new ErrorCode(1_010_006_003, "常规检查取消错误"); ErrorCode DEV_RECEIVE_CANCEL_EXCEPTION = new ErrorCode(1_010_006_004, "设备领用取消错误"); ErrorCode DEV_INSTALL_CANCEL_EXCEPTION = new ErrorCode(1_010_006_005, "设备装机取消错误"); ErrorCode DEV_LOSE_EXCEPTION = new ErrorCode(1_010_006_004, "遗失内部错误"); ErrorCode DEV_INSTALL_EXIST = new ErrorCode(1_010_006_005, "当天已有装机"); ErrorCode DEV_DISMANTLE_EXIST = new ErrorCode(1_010_006_006, "当天已有拆机"); ErrorCode DEV_INSTALL_NOT_APPOINTMENT = new ErrorCode(1_010_006_007, "请先预约确认"); ErrorCode DEV_INSTALL_NOT_RECEIVED = new ErrorCode(1_010_006_008, "请先领用设备"); ErrorCode ROUTINE_CHECK_EXIST = new ErrorCode(1_010_006_009, "当天已有检查"); ErrorCode JOB_RECORD_NOT_EXISTS = new ErrorCode(1_010_007_000, "工作记录不存在");
@@ -120,6 +120,20 @@ } } @PostMapping("/routine-check-cancel") @Operation(summary = "取消常规检查") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) { try { return devRentService.cancelRoutineOperation(cancelReqVO); } catch ( RuntimeException runtimeException ) { String err = ExceptionUtils.formatException( runtimeException ); log.error("routineCheckCancel: " + err); return CommonResult.error(ROUTINE_CANCEL_EXCEPTION); } } @PostMapping("/dev-ready-cancel") @Operation(summary = "取消领用") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") @@ -128,8 +142,8 @@ return devRentService.cancelReadyOperation(cancelReqVO); } catch ( RuntimeException runtimeException ) { String err = ExceptionUtils.formatException( runtimeException ); log.error("devCancel: " + err); return CommonResult.error(DEV_CANCEL_EXCEPTION); log.error("devReadyCancel: " + err); return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION); } } @@ -141,8 +155,8 @@ return devRentService.cancelInstallOperation(cancelReqVO); } catch ( RuntimeException runtimeException ) { String err = ExceptionUtils.formatException( runtimeException ); log.error("devCancel: " + err); return CommonResult.error(DEV_CANCEL_EXCEPTION); log.error("devInstallCancel: " + err); return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION); } }
@@ -62,6 +62,15 @@ */ Long dataEntryOperation(@Valid DevRentSaveReqVO createReqVO); /** * 常规检查 取消 * * @param cancelReqVO 创建信息 * @return 编号 */ CommonResult<Long> cancelRoutineOperation(@Valid DevCancelReqVO cancelReqVO); /** * 取消领用 * jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -103,7 +103,7 @@ List<Integer> jobTypeList = new ArrayList<Integer>(); jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState()); jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState()); jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState()); JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList); if (null != jobRecordDO) { jobRecordDO.setDevId(createReqVO.getDevId()); @@ -338,6 +338,62 @@ return updateReqVO.getId(); } // 常规检查 取消 @Override @Transactional public CommonResult<Long> cancelRoutineOperation(DevCancelReqVO cancelReqVO) { Long userId = SecurityFrameworkUtils.getLoginUserId(); String userNickname = SecurityFrameworkUtils.getLoginUserNickname(); DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class); createReqVO.setDevId(null); createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState()); Long rent_id = createReqVO.getId(); if (null == rent_id) { List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState()); if (devRentDOList.size() != 1) return CommonResult.error(ROUTINE_CHECK_EXIST); rent_id = devRentDOList.getFirst().getId(); createReqVO.setId( rent_id ); createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState() ); updateDevRent( createReqVO ); JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO(); jobRecordSaveReqVO.setRentId(rent_id); jobRecordSaveReqVO.setDevId(null); jobRecordSaveReqVO.setDocId(userId); jobRecordSaveReqVO.setDocName(userNickname); jobRecordSaveReqVO.setPatId(createReqVO.getPatId()); jobRecordSaveReqVO.setPatName(createReqVO.getPatName()); jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_CANCELLED.getState() ); jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime()); jobRecordSaveReqVO.setRemark(createReqVO.getRemark()); jobRecordSaveReqVO.setSummary(""); JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class); jobRecordMapper.insert(jobRecord); } else { updateDevRent( createReqVO ); List<Integer> jobTypeList = new ArrayList<Integer>(); jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState()); jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState()); JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList); if (null != jobRecordDO) { jobRecordDO.setDevId(null); jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState()); jobRecordDO.setJobTime(createReqVO.getRentTime()); jobRecordDO.setRemark(createReqVO.getRemark()); jobRecordDO.setUpdater(String.valueOf(userId)); jobRecordDO.setUpdateTime(LocalDateTime.now()); jobRecordMapper.updateById(jobRecordDO); } } return CommonResult.success(rent_id); } @Override @Transactional public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
