Fix Bug: 当天多个检查项目 打印小票 检查项目不对

eight

2024-11-25 4feb978ac9908a46e7285ab0c9a897b89fd99ff2

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

@@ -11,6 +11,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;

import java.time.LocalDate;
import java.util.*;
import java.io.IOException;

@@ -94,8 +95,9 @@
    @Operation(summary = "根据患者编号.查询当天预约")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId) {
        AppointmentDO appointment = appointmentService.getCurAppointmentByPatId( 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));
    }

@@ -103,9 +105,9 @@
    @Operation(summary = "根据患者编号.获得预约.并内部创建预约")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> queryAndCreateAppointmentByPatId(@RequestParam("patId") String patId) {
        AppointmentDO appointment = appointmentService.queryAndCreateAppointmentByPatId( patId );
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    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")
@@ -154,6 +156,7 @@
    @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);
    }