常规检查 step 2

eight

2024-10-14 24b7c98e01c211e93f00293e6e4e96ba1b9db93f

常规检查 step 2

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

@@ -109,6 +109,15 @@
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    }

    @GetMapping("/get-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 );
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    }

    @GetMapping("/page")
    @Operation(summary = "获得预约分页")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java

@@ -54,13 +54,13 @@
    @PostMapping("/routine-finish")
    @Operation(summary = "")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> routineFinish(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
    public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
        try {
            CommonResult<Long> result = devRentService.routineFinishOperation(createReqVO);
            CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
            return result;
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("checkFinish: " + err);
            log.error("routineFinish: " + err);
            return CommonResult.error(DEV_INSTALL_EXCEPTION);
        }
    }

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import java.time.LocalDateTime;

@Schema(description = "管理后台 - å¸¸è§„检查完成 Request VO")
@Data
public class RoutineFinishReqVO {

    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26525")
    private Long id;

    @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3986")
    //@NotEmpty(message = "设备编号不能为空")
    private String devId;

    @Schema(description = "患者编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4973")
    @NotEmpty(message = "患者编号不能为空")
    private String patId;

    @Schema(description = "患者名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
    @NotEmpty(message = "患者名称不能为空")
    private String patName;

    @Schema(description = "装机时间")
    private LocalDateTime rentTime;

    @Schema(description = "拆机时间")
    private LocalDateTime returnTime;

    @Schema(description = "录入时间")
    private LocalDateTime entryTime;

    @Schema(description = "干扰数")
    private Integer interference;

    @Schema(description = "基线粗")
    private String baseline;

    @Schema(description = "脱离")
    private String detachment;

    @Schema(description = "备注", example = "你猜")
    private String remark;

    @Schema(description = "状态")
    private Integer state;

    @Schema(description = "已付款")
    private Integer paid;

    @Schema(description = "诊室编号")
    Long roomId;

    @Schema(description = "诊床编号")
    String bedNo;
}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java

@@ -6,8 +6,11 @@
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * é¢„约 Mapper
@@ -41,4 +44,9 @@
                .orderByDesc(AppointmentDO::getId));
    }


    @Select("select * from lihu.appointment where pat_id = #{patId} and to_days(book_date) = to_days(Now()) limit 1")
    AppointmentDO getByPatId(@Param("patId") String patId);


}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java

@@ -45,6 +45,14 @@
    AppointmentDO getAppointment(Integer id);

    /**
     * èŽ·å¾—预约
     *
     * @param id ç¼–号
     * @return é¢„约
     */
    AppointmentDO getAppointmentByPatId(String patId);

    /**
     * èŽ·å¾—预约分页
     *
     * @param pageReqVO åˆ†é¡µæŸ¥è¯¢

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java

@@ -73,6 +73,11 @@
    }

    @Override
    public AppointmentDO getAppointmentByPatId(String patId) {
        return appointmentMapper.getByPatId( patId );
    }

    @Override
    public PageResult<AppointmentDO> getAppointmentPage(AppointmentPageReqVO pageReqVO) {
        return appointmentMapper.selectPage(pageReqVO);
    }

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java

@@ -28,7 +28,7 @@
     * @param createReqVO åˆ›å»ºä¿¡æ¯
     * @return ç¼–号
     */
    CommonResult<Long> routineFinishOperation(@Valid DevRentSaveReqVO createReqVO);
    CommonResult<Long> routineFinishOperation(@Valid RoutineFinishReqVO createReqVO);

    /**
     * è®¾å¤‡å‡†å¤‡

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java

@@ -60,7 +60,9 @@
    }

    @Override
    public CommonResult<Long> routineFinishOperation(DevRentSaveReqVO createReqVO) {
    public CommonResult<Long> routineFinishOperation(RoutineFinishReqVO routineFinishReqVO) {
        DevRentSaveReqVO createReqVO = BeanUtils.toBean(routineFinishReqVO, DevRentSaveReqVO.class);

        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();