From 8f410963380b34e4f80aaba0fe982437a9445b3c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 03 十二月 2024 15:31:49 +0800
Subject: [PATCH] 预约序号前缀

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 b77f2ec..901896a 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
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -22,6 +23,8 @@
     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())
@@ -35,7 +38,6 @@
                 .eqIfPresent(AppointmentDO::getPatWardCode, reqVO.getPatWardCode())
                 .eqIfPresent(AppointmentDO::getPatWardDesc, reqVO.getPatWardDesc())
                 .eqIfPresent(AppointmentDO::getPatBedNo, reqVO.getPatBedNo())
-                .eqIfPresent(AppointmentDO::getBookId, reqVO.getBookId())
                 .eqIfPresent(AppointmentDO::getBookDate, reqVO.getBookDate())
                 .eqIfPresent(AppointmentDO::getBookTimeslot, reqVO.getBookTimeslot())
                 .betweenIfPresent(AppointmentDO::getBookTime, reqVO.getBookTime())
@@ -44,9 +46,15 @@
                 .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);
+*/
 
     @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);
-}
\ No newline at end of file
+
+    @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);
+}
+

--
Gitblit v1.9.3