update

eight

2024-10-11 927aa2c9084fadc5f9c294bec25ab9f5e202c731

update

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

@@ -171,7 +171,7 @@
                        + bookEndTime.getHour()*100 + bookEndTime.getMinute() );

        //queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
        queueSaveReqVO.setBookCheckType( (byte)10 );
        queueSaveReqVO.setBookCheckType( 10 );

        queueSaveReqVO.setSeqNum(1);
        queueSaveReqVO.setStatus((byte)10);

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

@@ -40,6 +40,6 @@

    @Schema(description = "预约检查类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
    //@NotNull(message = "预约检查类型不能为空")
    private Byte bookCheckType;
    private Integer bookCheckType;

}

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

@@ -70,7 +70,7 @@
    private LocalDateTime[] bookTime;

    @Schema(description = "预约检查类型", example = "2")
    private Byte bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "预约来源：X系统、护士手动预约")
    private String bookSrc;

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

@@ -89,11 +89,11 @@

    @Schema(description = "预约检查类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
    @ExcelProperty(value = "预约检查类型", converter = DictConvert.class)
    private Byte bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "预约来源：X系统、护士手动预约", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("预约来源：X系统、护士手动预约")
    private String bookSrc;
    private Integer bookSrc;

    @Schema(description = "已付款")
    @ExcelProperty("已付款")

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

@@ -75,7 +75,7 @@

    @Schema(description = "预约检查类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
    @NotNull(message = "预约检查类型不能为空")
    private Byte bookCheckType;
    private Integer bookCheckType;

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

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java

@@ -28,7 +28,7 @@

    @Schema(description = "预约检查类型", example = "1")
    @ExcelProperty("预约检查类型")
    private Byte bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "排队序号", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("排队序号")

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java

@@ -32,7 +32,7 @@
    private Integer bookTimeslot;

    @Schema(description = "预约检查类型", example = "1")
    private Boolean bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "排队序号")
    private Integer seqNum;

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java

@@ -38,7 +38,7 @@

    @Schema(description = "预约检查类型", example = "1")
    @ExcelProperty("预约检查类型")
    private Byte bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "排队序号", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("排队序号")

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java

@@ -35,7 +35,7 @@
    private Integer bookTimeslot;

    @Schema(description = "预约检查类型", example = "1")
    private Byte bookCheckType;
    private Integer bookCheckType;

    @Schema(description = "排队序号", requiredMode = Schema.RequiredMode.REQUIRED)
    @NotNull(message = "排队序号不能为空")

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java

@@ -108,11 +108,11 @@
     * é¢„约检查类型
     *
     */
    private Byte bookCheckType;
    private Integer bookCheckType;
    /**
     * é¢„约来源：X系统、护士手动预约
     */
    private Byte bookSrc;
    private Integer bookSrc;

    /**
     * å·²ä»˜æ¬¾

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java

@@ -49,7 +49,7 @@
    /**
     * é¢„约检查类型
     */
    private Byte bookCheckType;
    private Integer bookCheckType;
    /**
     * æŽ’队序号
     */

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper2.java

ÎļþÃû´Ó jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java ÐÞ¸Ä
@@ -17,7 +17,7 @@
 * @author èŠ‹é“源码
 */
@Mapper
public interface queueMapper extends BaseMapperX<QueueDO> {
public interface queueMapper2 extends BaseMapperX<QueueDO> {

    default PageResult<QueueDO> selectPage(QueuePageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<QueueDO>()

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

@@ -37,7 +37,7 @@
        AppointmentDO appointment = BeanUtils.toBean(createReqVO, AppointmentDO.class);

        appointment.setBookTime( LocalDateTime.now() );
        appointment.setBookSrc((byte)0);
        appointment.setBookSrc( 0 );

        appointmentMapper.insert(appointment);
        // è¿”回

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java

@@ -1,10 +1,8 @@
package cn.lihu.jh.module.ecg.service.callingscreen;

import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper2;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +12,6 @@

import javax.annotation.Resource;
import java.util.*;

import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.PATIENT_NOT_EXISTS;

/**
 * æŽ’队 Service å®žçŽ°ç±»
@@ -28,7 +24,7 @@
public class CallingScreenServiceImpl implements CallingScreenService {

    @Resource
    private queueMapper queueMapper;
    private queueMapper2 queueMapper;

    @Resource
    private RoomMapper roomMapper;

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

@@ -48,6 +48,9 @@
    @Resource
    DeviceMapper deviceMapper;

    @Resource
    QueueMapper queueMapper;

    @Override
    public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
        Long rent_id = createDevRent(createReqVO);
@@ -114,6 +117,10 @@
                jobRecordMapper.updateById(jobRecordDO);
            }
        }

        // æ‚£è€…排队状态 æ›´æ–°ä¸º å·²é¢†ç”¨
        queueMapper.

        return CommonResult.success(rent_id);
    }


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java

@@ -7,7 +7,6 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
@@ -27,7 +26,7 @@
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper2;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -50,7 +49,7 @@
    private OAuth2TokenApi oAuth2TokenApi;

    @Resource
    private queueMapper queueMapper;
    private queueMapper2 queueMapper;

    @Resource
    private RoomMapper roomMapper;

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java

@@ -11,7 +11,7 @@
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper2;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
@@ -44,7 +44,7 @@
    private OAuth2TokenApi oAuth2TokenApi;

    @Resource
    private queueMapper queueMapper;
    private queueMapper2 queueMapper;

    @Resource
    private RoomMapper roomMapper;

 jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/queue/queueMapper.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper">
<mapper namespace="cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper2">

    <!--
        ä¸€èˆ¬æƒ…况下，尽可能使用 Mapper è¿›è¡Œ CRUD å¢žåˆ æ”¹æŸ¥å³å¯ã€‚