From 3d1344ca6f0613bf3726d2c40d35f3928f82a910 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 18:15:27 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index 901896a..100ce5c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -1,15 +1,17 @@
package cn.lihu.jh.module.ecg.dal.mysql.appointment;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
+import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentPageReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
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;
+import org.apache.ibatis.annotations.Update;
import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
/**
@@ -21,40 +23,36 @@
public interface AppointmentMapper extends BaseMapperX<AppointmentDO> {
default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
-
- return selectPage(reqVO, new LambdaQueryWrapperX<AppointmentDO>()
- .eqIfPresent(AppointmentDO::getApplyNo, reqVO.getApplyNo())
- .eqIfPresent(AppointmentDO::getEpisodeId, reqVO.getEpisodeId())
- .eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId())
- .likeIfPresent(AppointmentDO::getPatName, reqVO.getPatName())
- .eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender())
- .eqIfPresent(AppointmentDO::getPatBirthday, reqVO.getPatBirthday())
- .eqIfPresent(AppointmentDO::getPatMobile, reqVO.getPatMobile())
- .eqIfPresent(AppointmentDO::getPatPhone, reqVO.getPatPhone())
- .eqIfPresent(AppointmentDO::getPatIdentityId, reqVO.getPatIdentityId())
- .eqIfPresent(AppointmentDO::getPatAddr, reqVO.getPatAddr())
- .eqIfPresent(AppointmentDO::getPatDeptCode, reqVO.getPatDeptCode())
- .eqIfPresent(AppointmentDO::getPatDeptDesc, reqVO.getPatDeptDesc())
- .eqIfPresent(AppointmentDO::getPatWardCode, reqVO.getPatWardCode())
- .eqIfPresent(AppointmentDO::getPatWardDesc, reqVO.getPatWardDesc())
- .eqIfPresent(AppointmentDO::getPatBedNo, reqVO.getPatBedNo())
- .eqIfPresent(AppointmentDO::getBookDate, reqVO.getBookDate())
- .eqIfPresent(AppointmentDO::getBookTimeslot, reqVO.getBookTimeslot())
- .betweenIfPresent(AppointmentDO::getBookTime, reqVO.getBookTime())
- .eqIfPresent(AppointmentDO::getBookCheckType, reqVO.getBookCheckType())
- .eqIfPresent(AppointmentDO::getBookSrc, reqVO.getBookSrc())
- .orderByDesc(AppointmentDO::getId));
+ LambdaQueryWrapperX<AppointmentDO> wrapper = (LambdaQueryWrapperX<AppointmentDO>)
+ new LambdaQueryWrapperX<AppointmentDO>().
+ eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId()).likeIfPresent(AppointmentDO::getPatName, reqVO.getPatName()).eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender()).eqIfPresent(AppointmentDO::getPatBirthday, reqVO.getPatBirthday()).eqIfPresent(AppointmentDO::getPatMobile, reqVO.getPatMobile()).eqIfPresent(AppointmentDO::getPatPhone, reqVO.getPatPhone()).eqIfPresent(AppointmentDO::getPatIdentityId, reqVO.getPatIdentityId()).eqIfPresent(AppointmentDO::getPatAddr, reqVO.getPatAddr()).eqIfPresent(AppointmentDO::getPatDeptCode, reqVO.getPatDeptCode()).eqIfPresent(AppointmentDO::getPatDeptDesc, reqVO.getPatDeptDesc()).eqIfPresent(AppointmentDO::getPatWardCode, reqVO.getPatWardCode()).eqIfPresent(AppointmentDO::getPatWardDesc, reqVO.getPatWardDesc()).eqIfPresent(AppointmentDO::getBookDate, reqVO.getBookDate()).eqIfPresent(AppointmentDO::getBookTimeslot, reqVO.getBookTimeslot()).eqIfPresent(AppointmentDO::getBookCheckType, reqVO.getBookCheckType()).eqIfPresent(AppointmentDO::getBookSrc, reqVO.getBookSrc()).eqIfPresent(AppointmentDO::getPaid, reqVO.getPaid()).eqIfPresent(AppointmentDO::getApplyNo, reqVO.getApplyNo()).eqIfPresent(AppointmentDO::getEpisodeId, reqVO.getEpisodeId()).inIfPresent(AppointmentDO::getStatus, reqVO.getStatus())
+ // 鉁� 鏂板锛歝reateTime 鍖洪棿鏌ヨ
+ .betweenIfPresent(AppointmentDO::getCreateTime, reqVO.getCreateTimeStart(), reqVO.getCreateTimeEnd()).betweenIfPresent(AppointmentDO::getRegisterDate, reqVO.getRegisterDateStart(), reqVO.getRegisterDateEnd());
+ // 鍔ㄦ�佹帓搴�
+ if (reqVO.getOrderCreateTime() != null) {
+ wrapper.orderByDesc(AppointmentDO::getCreateTime);
+ } else {
+ wrapper.orderByAsc(AppointmentDO::getRegisterDate).orderByAsc(AppointmentDO::getPatWardDesc);
+ }
+ return selectPage(reqVO, wrapper);
}
-/*
+
@Select("select * from lihu.appointment where pat_id = #{patId} and to_days(book_date) = to_days(Now())")
- List<AppointmentDO> getCurrentPatId(@Param("patId") String patId);
-*/
+ List<AppointmentDO> getCurrentPatId(String patId);
+
+ @Select("select * from lihu.appointment where (apply_no = #{code} or episode_id= #{code} or hospital_no =#{code} or pat_identity_id=#{code}) and to_days(book_date) = to_days(Now())")
+ List<AppointmentDO> getCurrentCode(String code);
@Select("select * from lihu.appointment where pat_id = #{patId} and book_check_type = #{checkType} and to_days(book_date) = to_days(Now()) limit 1")
- AppointmentDO getCurrentByPatAndCheckType(@Param("patId") String patId, @Param("checkType") Integer checkType);
+ AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
- @Select("select * from lihu.appointment where pat_id = #{patId} and book_check_type = #{checkType} and to_days(book_date) = to_days(#{book_date}) limit 1")
- AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType, @Param("book_date") LocalDate book_date);
+ Integer updateStatusByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status, @Param("registerDate") Date registerDate);
+
+ @Select("select * from lihu.appointment where episode_id = #{episodeId} and apply_no = #{applyNo} limit 1")
+ AppointmentDO getByEpisodeIdAndApplyNo(@Param("episodeId") String episodeId, @Param("applyNo") String applyNo);
+
+ @Select("select * from lihu.appointment where apply_no = #{applyNo} limit 1")
+ AppointmentDO getByApplyNo(@Param("applyNo") String applyNo);
}
--
Gitblit v1.9.3