From 4156037feb8e52df855c3c57b735134b5ed1ccfe Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 16:50:29 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
index 5abba9a..c0c1837 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
@@ -3,17 +3,17 @@
import java.util.*;
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.module.ecg.controller.admin.room.vo.RoomPageReqVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
-import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
+import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
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 cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
+import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
/**
* 璇婂鍜岃瘖鐤楀簥 Mapper
@@ -21,15 +21,18 @@
* @author 鑺嬮亾婧愮爜
*/
@Mapper
-public interface RoomMapper extends BaseMapperX<RoomResVO> {
+public interface RoomMapper extends BaseMapperX<RoomDO> {
- default PageResult<RoomResVO> selectPage(RoomPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<RoomResVO>()
- .eqIfPresent(RoomResVO::getRoomId, reqVO.getRoomId())
- .eqIfPresent(RoomResVO::getBedNo, reqVO.getBedNo())
- .betweenIfPresent(RoomResVO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(RoomResVO::getId));
+ default PageResult<RoomDO> selectPage(RoomPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<RoomDO>()
+ .eqIfPresent(RoomDO::getRoomId, reqVO.getRoomId())
+ .eqIfPresent(RoomDO::getBedNo, reqVO.getBedNo())
+ .betweenIfPresent(RoomDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(RoomDO::getId));
}
+
+ @Update(" update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null")
+ Integer resetRoom(@Param("newStatus") BedStatusEnum newStatus);
@Select({ "SELECT room_id, room_name, count(1) as bed_num FROM lihu.clinic_room group by room_id;" })
List<RoomStatisticsDO> roomStatistic();
@@ -39,21 +42,23 @@
"where status in ( " +
" <foreach collection='curStatusList' separator=',' item='curStatus'>" +
" #{curStatus.status} " +
- " </foreach> );" +
+ " </foreach> )" +
+ " and deleted = 0;" +
"</script>")
- List<RoomResVO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList);
+ List<RoomDO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList);
@Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId}")
- RoomResVO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId);
+ RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId);
@Update("<script> " +
- "update lihu.clinic_room set status=#{newStatus.status} where room_id=#{roomId} and bed_no=#{bedNo} " +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null " +
+ "where room_id=#{roomId} and bed_no=#{bedNo} " +
"and status in ( " +
" <foreach collection='curStatusList' separator=',' item='curStatus'>" +
" #{curStatus.status} " +
" </foreach> );" +
"</script>")
- Integer setBedStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+ Integer setBedOpeningClosed(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
@Update("<script> " +
"update lihu.clinic_room set status=#{newStatus.status} " +
--
Gitblit v1.9.3