工位选择界面 诊室按照room id排序

eight

2024-12-12 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java

@@ -1,20 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;

import cn.hutool.core.bean.BeanUtil;
import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.util.date.DateUtils;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.DevRentSaveReqVO;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
import cn.lihu.jh.module.ecg.feign.RestApiResult;
import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal;
import cn.lihu.jh.module.ecg.service.devrent.DevRentService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import cn.lihu.jh.module.ecg.service.room.RoomService;
import cn.lihu.jh.module.system.api.dept.DeptApi;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,12 +11,9 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.LocalDate;
import java.util.*;
import java.io.IOException;
import java.util.stream.Collectors;

import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.pojo.PageResult;
@@ -42,8 +28,6 @@
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.*;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;

import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
@@ -77,7 +61,7 @@
    @PostMapping("/create")
    @Operation(summary = "创建预约")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:create')")
    public CommonResult<Integer> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
    public CommonResult<Long> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
        return success(appointmentService.createAppointment(createReqVO));
    }

@@ -93,7 +77,7 @@
    @Operation(summary = "删除预约")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('ecg:appointment:delete')")
    public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Integer id) {
    public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Long id) {
        appointmentService.deleteAppointment(id);
        return success(true);
    }
@@ -102,18 +86,39 @@
    @Operation(summary = "获得预约")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Integer id) {
    public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Long id) {
        AppointmentDO appointment = appointmentService.getAppointment(id);
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    }

    @GetMapping("/get-by-patient")
    @Operation(summary = "根据患者编号.获得预约")
    @GetMapping("/get-current-by-patient")
    @Operation(summary = "根据患者编号.查询当天预约")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> getAppointmentByPatient(@RequestParam("patId") String patId) {
        AppointmentDO appointment = appointmentService.getAppointmentByPatId( patId );
    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));
    }

    @GetMapping("/query-and-create-by-patient")
    @Operation(summary = "根据患者编号.获得预约.并内部创建预约")
    @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 );
        return success(BeanUtils.toBean(appointmentDOList, AppointmentRespVO.class));
    }

    @GetMapping("/query-his-by-patient")
    @Operation(summary = "从HIS.查询患者预约/开单信息")
    @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);
        return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class));
    }

    @GetMapping("/page")
@@ -140,9 +145,20 @@
    @PostMapping("/confirm")
    @Operation(summary = "预约确认")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
    public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
        appointmentService.appoitmentConfirm( confirmReqVO );
        return success("确认成功");
    public CommonResult<Integer> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
        confirmReqVO.setIsVip(0);
        Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO );
        return success(newSeqNo);
    }

    @PostMapping("/confirm-vip")
    @Operation(summary = "VIP预约确认")
    @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 );
        return success(newSeqNo);
    }

}