From 88ca2e40cdd8b209b7c13f97de9e98564e0e75ba Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 七月 2025 16:20:22 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 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 8eb5159..8d9d205 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
@@ -23,43 +23,14 @@
public interface AppointmentMapper extends BaseMapperX<AppointmentDO> {
default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
- 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())
- // 鏃堕棿鑼冨洿鏌ヨ锛屾敞鎰忚繖閲屽己鍒舵寚瀹氱被鍨嬩负 LambdaQueryWrapperX
- .and(reqVO.getRegisterTime() != null, w -> {
- LocalDate today = LocalDate.now();
- if ("涓婂崍".equals(reqVO.getRegisterTime())) {
- w.between(AppointmentDO::getRegisterDate, today.atTime(5, 0, 0), today.atTime(13, 0, 0));
- } else if ("涓嬪崍".equals(reqVO.getRegisterTime())) {
- w.between(AppointmentDO::getRegisterDate, today.atTime(13, 0, 1), today.atTime(22, 0, 0));
- }
- });
-
+ 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);
+ wrapper.orderByAsc(AppointmentDO::getRegisterDate).orderByAsc(AppointmentDO::getPatWardDesc);
}
return selectPage(reqVO, wrapper);
}
@@ -74,7 +45,6 @@
@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 getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
- @Update("update lihu.appointment set status = #{status} " + "<if test='registerDate != null'>" + ", register_date = #{registerDate} " + "</if>" + "where apply_no = #{applyNo};")
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")
--
Gitblit v1.9.3