From 811e30133a6dcc6853aafbbe2bbd6a1b88e8fc71 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 10:35:07 +0800
Subject: [PATCH] 调整拆机查询实现-支持根据患者查找
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java | 3 +--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 2 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSearchReqVO.java | 31 +++++++++++++++++++++++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 5 ++---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml | 13 +++++++++++++
6 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index a1bca10..622fe67 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -138,11 +138,10 @@
@GetMapping("/get-latest-rent")
@Operation(summary = "鑾峰彇鎮ｈ�呰澶囩殑鏈�杩戠璧佹儏鍐�")
- @Parameter(name = "dev-id", description = "璁惧缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getLatestRent( @RequestParam("dev-id") String devId )
+ public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
{
- DevRentDO devRent = devRentService.getLatestRent( devId );
+ DevRentDO devRent = devRentService.getLatestRent( searchReqVO );
return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSearchReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSearchReqVO.java
new file mode 100644
index 0000000..a303e05
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSearchReqVO.java
@@ -0,0 +1,31 @@
+package cn.lihu.jh.module.ecg.controller.admin.devrent.vo;
+
+import cn.lihu.jh.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠＄悊鍚庡彴 - 瑁呮満鎷嗘満鏌ヨ Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DevRentSearchReqVO extends PageParam {
+
+ @Schema(description = "璁惧缂栧彿", example = "3986")
+ private String devId;
+
+ @Schema(description = "鎮ｈ�呯紪鍙�", example = "4973")
+ private String patId;
+
+ @Schema(description = "鎮ｈ�呭悕绉�", example = "鑺嬭壙")
+ private String patName;
+
+ @Schema(description = "鍙栨秷瀹夎")
+ private Integer cancelled;
+}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
index 699c511..3e075ac 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
@@ -34,7 +34,6 @@
.orderByDesc(DevRentDO::getId));
}
- @Select("select * from lihu.dev_rent where dev_id=#{devId} order by rent_time desc limit 1")
- DevRentDO getLatestRent( @Param("devId") String devId );
+ DevRentDO getLatestRent(DevRentSearchReqVO reqVO );
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
index f1e640d..61676ab 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -79,5 +79,5 @@
*/
PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO);
- DevRentDO getLatestRent(String devId);
+ DevRentDO getLatestRent(DevRentSearchReqVO searchReqVO);
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index 445794c..43026b5 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -220,8 +220,8 @@
}
@Override
- public DevRentDO getLatestRent(String devId) {
- return devRentMapper.getLatestRent(devId);
+ public DevRentDO getLatestRent(DevRentSearchReqVO searchReqVO) {
+ return devRentMapper.getLatestRent(searchReqVO);
}
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml b/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
index 0dcc0be..7d7380e 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/resources/mapper/devrent/DevRentMapper.xml
@@ -9,4 +9,17 @@
鏂囨。鍙锛歨ttps://www.iocoder.cn/MyBatis/x-plugins/
-->
+ <select id="getLatestRent" resultType="cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO">
+ select * from lihu.dev_rent
+ <where>
+ <if test="devId != null and devId != ''">
+ and dev_id = #{devId}
+ </if>
+ <if test="patId != null and patId != ''">
+ and pat_id = #{patId}
+ </if>
+ </where>
+ order by rent_time desc limit 1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3