From a4c8c09a33ae26a460c7422f59b4d2f93d0f6dc5 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 16 六月 2025 19:38:09 +0800 Subject: [PATCH] 代码提交 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java index 4b8f4a7..a91ea71 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java @@ -26,6 +26,7 @@ import cn.lihu.jh.framework.excel.core.util.ExcelUtils; import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog; + import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; @@ -73,6 +74,14 @@ return success(true); } + @PostMapping("/updateStatus") + @Operation(summary = "鏇存柊鐢宠鐘舵��") + @PreAuthorize("@ss.hasPermission('ecg:appointment:update')") + public CommonResult<Boolean> updateAppointmentStatus(@Valid @RequestBody AppointmentSaveReqVO updateReqVO) { + appointmentService.updateAppointmentStatus(updateReqVO); + return success(true); + } + @DeleteMapping("/delete") @Operation(summary = "鍒犻櫎棰勭害") @Parameter(name = "id", description = "缂栧彿", required = true) @@ -95,9 +104,8 @@ @Operation(summary = "鏍规嵁鎮h�呯紪鍙�.鏌ヨ褰撳ぉ棰勭害") @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") - public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId, - @RequestParam("checkType") Integer checkType) { - AppointmentDO appointment = appointmentService.getCurAppointmentByPatIdAndCheckType( patId, checkType ); + public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId, @RequestParam("checkType") Integer checkType) { + AppointmentDO appointment = appointmentService.getCurAppointmentByPatIdAndCheckType(patId, checkType); return success(BeanUtils.toBean(appointment, AppointmentRespVO.class)); } @@ -106,7 +114,7 @@ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") public CommonResult<List<AppointmentRespVO>> queryAndCreateAppointmentByPatId(@RequestParam("patId") String patId) { - List<AppointmentDO> appointmentDOList = appointmentService.queryAndCreateAppointmentByPatId( patId ); + List<AppointmentDO> appointmentDOList = appointmentService.queryAndCreateAppointmentByPatId(patId); return success(BeanUtils.toBean(appointmentDOList, AppointmentRespVO.class)); } @@ -115,9 +123,8 @@ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") public CommonResult<AppointmentRespVO> queryHisByPatient(@RequestParam("patId") String patId) { - List<AppointmentDO> appointmentList = appointmentService.getAppointmentExtermal( patId ); - if ( 0 == appointmentList.size() ) - return error(APPOINTMENT_NOT_BILLING); + List<AppointmentDO> appointmentList = appointmentService.getAppointmentExtermal(patId); + if (0 == appointmentList.size()) return error(APPOINTMENT_NOT_BILLING); return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class)); } @@ -133,13 +140,11 @@ @Operation(summary = "瀵煎嚭棰勭害 Excel") @PreAuthorize("@ss.hasPermission('ecg:appointment:export')") @ApiAccessLog(operateType = EXPORT) - public void exportAppointmentExcel(@Valid AppointmentPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + public void exportAppointmentExcel(@Valid AppointmentPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List<AppointmentDO> list = appointmentService.getAppointmentPage(pageReqVO).getList(); // 瀵煎嚭 Excel - ExcelUtils.write(response, "棰勭害.xls", "鏁版嵁", AppointmentRespVO.class, - BeanUtils.toBean(list, AppointmentRespVO.class)); + ExcelUtils.write(response, "棰勭害.xls", "鏁版嵁", AppointmentRespVO.class, BeanUtils.toBean(list, AppointmentRespVO.class)); } @PostMapping("/confirm") @@ -147,7 +152,7 @@ @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')") public CommonResult<Integer> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) { confirmReqVO.setIsVip(0); - Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO ); + Integer newSeqNo = appointmentService.appoitmentConfirm(confirmReqVO); return success(newSeqNo); } @@ -156,8 +161,8 @@ @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')") public CommonResult<Integer> appointmentConfirmVip(@RequestBody AppointmentConfirmReqVO confirmReqVO) { confirmReqVO.setIsVip(1); - confirmReqVO.setBookDate( LocalDate.now() ); - Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO ); + confirmReqVO.setBookDate(LocalDate.now()); + Integer newSeqNo = appointmentService.appoitmentConfirm(confirmReqVO); return success(newSeqNo); } -- Gitblit v1.9.3