From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 12 十二月 2024 19:47:57 +0800 Subject: [PATCH] 工位选择界面 诊室按照room id排序 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queuesequence/QueueSequenceController.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queuesequence/QueueSequenceController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queuesequence/QueueSequenceController.java index 082e42f..3aee1e2 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queuesequence/QueueSequenceController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queuesequence/QueueSequenceController.java @@ -40,14 +40,14 @@ @PostMapping("/create") @Operation(summary = "鍒涘缓褰撳ぉ搴忓彿") - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:create')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Integer> createQueueSequence(@Valid @RequestBody QueueSequenceSaveReqVO createReqVO) { return success(queueSequenceService.createQueueSequence(createReqVO)); } @PutMapping("/update") @Operation(summary = "鏇存柊褰撳ぉ搴忓彿") - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:update')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Boolean> updateQueueSequence(@Valid @RequestBody QueueSequenceSaveReqVO updateReqVO) { queueSequenceService.updateQueueSequence(updateReqVO); return success(true); @@ -56,7 +56,7 @@ @DeleteMapping("/delete") @Operation(summary = "鍒犻櫎褰撳ぉ搴忓彿") @Parameter(name = "id", description = "缂栧彿", required = true) - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:delete')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Boolean> deleteQueueSequence(@RequestParam("id") Integer id) { queueSequenceService.deleteQueueSequence(id); return success(true); @@ -65,15 +65,24 @@ @GetMapping("/get") @Operation(summary = "鑾峰緱褰撳ぉ搴忓彿") @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:query')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<QueueSequenceRespVO> getQueueSequence(@RequestParam("id") Integer id) { QueueSequenceDO queueSequence = queueSequenceService.getQueueSequence(id); return success(BeanUtils.toBean(queueSequence, QueueSequenceRespVO.class)); } + @GetMapping("/get-timeslot-by-checktype") + @Operation(summary = "鑾峰緱褰撳ぉ鏈弧鐨刅IP鏃堕棿娈�") + @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") + public CommonResult<List<QueueSequenceRespVO>> getTimeslotByCheckType(@RequestParam("checkType") Integer checkType) { + List<QueueSequenceDO> queueSequenceList = queueSequenceService.selectGivenCheckTypeTimeslot(checkType); + return success(BeanUtils.toBean(queueSequenceList, QueueSequenceRespVO.class)); + } + @GetMapping("/page") @Operation(summary = "鑾峰緱褰撳ぉ搴忓彿鍒嗛〉") - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:query')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<PageResult<QueueSequenceRespVO>> getQueueSequencePage(@Valid QueueSequencePageReqVO pageReqVO) { PageResult<QueueSequenceDO> pageResult = queueSequenceService.getQueueSequencePage(pageReqVO); return success(BeanUtils.toBean(pageResult, QueueSequenceRespVO.class)); @@ -81,7 +90,7 @@ @GetMapping("/export-excel") @Operation(summary = "瀵煎嚭褰撳ぉ搴忓彿 Excel") - @PreAuthorize("@ss.hasPermission('ecg:queue-sequence:export')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") @ApiAccessLog(operateType = EXPORT) public void exportQueueSequenceExcel(@Valid QueueSequencePageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -92,4 +101,4 @@ BeanUtils.toBean(list, QueueSequenceRespVO.class)); } -} \ No newline at end of file +} -- Gitblit v1.9.3