From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
index e4a17eb..8892479 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
@@ -26,6 +26,7 @@
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.service.jobrecord.JobRecordService;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@
@Resource
private JobRecordService jobRecordService;
+
+ /** 銆愪富/鍥磋銆戝洿瑙備汉鏌�"宸ヤ綅涓讳汉鐨勮褰�"鏃堕渶瑕佹牎楠岃宸ヤ綅褰撳墠涓讳汉 */
+ @Resource
+ private RoomService roomService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヤ綔璁板綍")
@@ -82,13 +87,24 @@
}
@GetMapping("/doctor-page")
- @Operation(summary = "鑾峰緱鐢ㄦ埛鑷繁鐨勫伐浣滆褰曞垎椤�")
+ @Operation(summary = "鑾峰緱宸ヤ綔璁板綍鍒嗛〉锛堥粯璁ゆ煡鑷繁锛涘洿瑙傛椂鎸夊伐浣嶄富浜烘煡锛�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<PageResult<JobRecordRespVO>> getJobRecordDoctorPage(@Valid JobRecordPageReqVO pageReqVO) {
+ public CommonResult<PageResult<JobRecordRespVO>> getJobRecordDoctorPage(
+ @Valid JobRecordPageReqVO pageReqVO,
+ @RequestParam(value = "roomId", required = false) Long roomId,
+ @RequestParam(value = "bedNo", required = false) String bedNo) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- pageReqVO.setDocId( userId );
+ // 銆愪富/鍥磋銆戦粯璁ゆ煡鑷繁鐨勮褰曪紙淇濇寔鍘熻涓猴級锛�
+ // 浼犱簡鍒汉鐨� docId锛堝洿瑙傛椂鍓嶇浼�"璇ュ伐浣嶄富浜�"锛夆啋 蹇呴』鏍￠獙璇ュ伐浣嶅綋鍓嶄富浜虹‘瀹炴槸杩欎釜 docId锛�
+ // 鍚﹀垯鍥磋浜虹湅鍒扮殑"宸插畬鎴愭鏌ヨ褰�"姘歌繙鏄┖鐨勶紙鍘熷疄鐜版棤鏉′欢瑕嗙洊鎴愮櫥褰曚汉锛夈��
+ Long ownerDocId = pageReqVO.getDocId();
+ if (null == ownerDocId || ownerDocId.equals(userId)) {
+ pageReqVO.setDocId(userId);
+ } else {
+ roomService.assertBedOwnerIs(roomId, bedNo, ownerDocId);
+ }
+
PageResult<JobRecordDO> pageResult = jobRecordService.getJobRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, JobRecordRespVO.class));
}
--
Gitblit v1.9.3