jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -215,6 +215,7 @@ queueSaveReqVO.setBookCheckType(appointment.getBookCheckType()); queueSaveReqVO.setPassed((byte) 0); queueSaveReqVO.setExpired((byte) 0); queueSaveReqVO.setPatDetails( appointment.getPatDeptDesc() + "-" + appointment.getPatWardDesc() + "-" + appointment.getPatBedNo()); queueService.queue(queueSaveReqVO); } catch (DuplicateKeyException duplicateKeyException) { return success("您已经在排队中了"); jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -236,6 +236,20 @@ BeanUtils.toBean(list, DevRentRespVO.class)); } @GetMapping("/get-free-rent") @Operation(summary = "获取已领取租赁情况") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<DevRentRespVO> getFreeRent( @Valid DevRentSearchReqVO searchReqVO ) { DevRentDO devRent = devRentService.getFreeRent( searchReqVO ); if (null == devRent) { return CommonResult.success(null); } DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class); return CommonResult.success(devRentRespVO); } @GetMapping("/get-ready-rent") @Operation(summary = "获取已领取租赁情况") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java
@@ -28,6 +28,10 @@ @ExcelProperty("患者名称") private String patName; @Schema(description = "患者详情", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @ExcelProperty("患者详情") private String patDetails; @Schema(description = "装机时间") @ExcelProperty("装机时间") private LocalDateTime rentTime; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
@@ -26,6 +26,9 @@ @Schema(description = "患者性别") private Byte patGender; @Schema(description = "患者详情") private String patDetails; @Schema(description = "预约日期", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "预约日期不能为空") private LocalDate bookDate; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java
@@ -40,6 +40,10 @@ */ private String patId; /** * 患者详情 */ private String patDetails; /** * 患者名称 */ private String patName; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -134,6 +134,7 @@ PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO); DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO); DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO); DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO); DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -609,6 +609,14 @@ } @Override public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) { List<Integer> stateList = new ArrayList<>(); stateList.add( DevRentStateEnum.FREE.getState() ); searchReqVO.setStateList( stateList ); return devRentMapper.getRentByState(searchReqVO); } @Override public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) { List<Integer> stateList = new ArrayList<>(); stateList.add( DevRentStateEnum.READY.getState() ); jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -323,6 +323,7 @@ DevRentDO devRent = BeanUtils.toBean(queueSaveReqVO, DevRentDO.class); devRent.setState( DevRentStateEnum.FREE.getState() ); devRent.setPatDetails( queueSaveReqVO.getPatDetails() ); devRentMapper.insert(devRent); startHurryUpOneCheckType( queue.getBookCheckType() );