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 |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 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 98c9d1a..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
@@ -8,8 +8,10 @@
 import org.apache.ibatis.annotations.Mapper;
 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,34 +23,30 @@
 public interface AppointmentMapper extends BaseMapperX<AppointmentDO> {
 
     default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<AppointmentDO>()
-                .eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId())
-                .eqIfPresent(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())
-                .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(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 getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
 
+    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);
 

--
Gitblit v1.9.3