From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 28 十一月 2024 14:40:46 +0800
Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
index 987d12e..6cf9eee 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
@@ -6,8 +6,6 @@
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import org.apache.ibatis.annotations.*;
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
@@ -26,12 +24,35 @@
.eqIfPresent(CheckTypeDO::getReadyNum, reqVO.getReadyNum())
.betweenIfPresent(CheckTypeDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(CheckTypeDO::getNeedDevReady, reqVO.getNeedDevReady())
+ .eqIfPresent(CheckTypeDO::getCallingColumn, reqVO.getCallingColumn())
+ .eqIfPresent(CheckTypeDO::getDisplayBarcode, reqVO.getDisplayBarcode())
+ .eqIfPresent(CheckTypeDO::getExpenseRecognition, reqVO.getExpenseRecognition())
+ .eqIfPresent(CheckTypeDO::getTimeslotBookNum, reqVO.getTimeslotBookNum())
+ .eqIfPresent(CheckTypeDO::getTimeslotReservedNum, reqVO.getTimeslotReservedNum())
+ .eqIfPresent(CheckTypeDO::getAffinityCheckTypes, reqVO.getAffinityCheckTypes())
.orderByDesc(CheckTypeDO::getId));
}
- @Select("<script> " +
- "SELECT * FROM lihu.check_type;" +
- "</script>")
+ default PageResult<CheckTypeDO> selectPageForCallingScreen(CheckTypePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<CheckTypeDO>()
+ .likeIfPresent(CheckTypeDO::getName, reqVO.getName())
+ .eqIfPresent(CheckTypeDO::getValue, reqVO.getValue())
+ .eqIfPresent(CheckTypeDO::getReadyNum, reqVO.getReadyNum())
+ .betweenIfPresent(CheckTypeDO::getCreateTime, reqVO.getCreateTime())
+ .eqIfPresent(CheckTypeDO::getNeedDevReady, reqVO.getNeedDevReady())
+ .neIfPresent(CheckTypeDO::getCallingColumn, reqVO.getCallingColumn())
+ .eqIfPresent(CheckTypeDO::getDisplayBarcode, reqVO.getDisplayBarcode())
+ .eqIfPresent(CheckTypeDO::getExpenseRecognition, reqVO.getExpenseRecognition())
+ .eqIfPresent(CheckTypeDO::getTimeslotBookNum, reqVO.getTimeslotBookNum())
+ .eqIfPresent(CheckTypeDO::getTimeslotReservedNum, reqVO.getTimeslotReservedNum())
+ .eqIfPresent(CheckTypeDO::getAffinityCheckTypes, reqVO.getAffinityCheckTypes())
+ .orderByDesc(CheckTypeDO::getId));
+ }
+
+ @Select("SELECT * FROM lihu.check_type;")
+ @Results({
+ @Result(property = "affinityCheckTypes", column = "affinity_check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
List<CheckTypeDO> simpleCheckTypeList();
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3