From eb3195e397b023cfae1ee4dea7fbc29f1271504f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 07 六月 2025 15:37:51 +0800
Subject: [PATCH] 代码提交

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 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 c943597..98c9d1a 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,11 +1,11 @@
 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;
 
@@ -21,12 +21,9 @@
 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::getPatName, reqVO.getPatName())
                 .eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender())
                 .eqIfPresent(AppointmentDO::getPatBirthday, reqVO.getPatBirthday())
                 .eqIfPresent(AppointmentDO::getPatMobile, reqVO.getPatMobile())
@@ -37,27 +34,25 @@
                 .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())
+                .eqIfPresent(AppointmentDO::getPaid, reqVO.getPaid())
                 .orderByDesc(AppointmentDO::getId));
     }
 
-/*
+
     @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 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);
-
-    @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);
+    AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
 
     @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