From c2b8fdfd594d68574325d94eff312c8c00b6b73a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 06 七月 2025 16:44:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 8b77350..778baac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -46,9 +46,9 @@
//鑾峰彇褰撳墠鐧婚檰浜�
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
- if (!"admin".equals(user.getUserName()) && CollectionUtils.isEmpty(patMedInhosp.getDeptcodes()) && CollectionUtils.isEmpty(patMedInhosp.getHospitaldistrictcodes()))
- //濡傛灉鍦ㄩ櫌鐥呭尯绉戝鍚屾椂闂翠负绌猴紝杩斿洖绌�
+ if (!"admin".equals(user.getUserName()) && shouldReturnEmpty(patMedInhosp)) {
return getDataTable2(0, null);
+ }
PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
@@ -60,6 +60,7 @@
});
return getDataTable2(count, list);
}
+
/**
* 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
@@ -174,4 +175,14 @@
return getDataTable(patMedInhospService.getDocAndPat(patMedInhosp));
}
+
+ private boolean shouldReturnEmpty(PatMedInhosp patMedInhosp) {
+ return (patMedInhosp.getCry() == 1
+ && CollectionUtils.isEmpty(patMedInhosp.getLeaveldeptcodes())
+ && CollectionUtils.isEmpty(patMedInhosp.getLeavehospitaldistrictcodes()))
+ || (patMedInhosp.getCry() == 0
+ && CollectionUtils.isEmpty(patMedInhosp.getDeptcodes())
+ && CollectionUtils.isEmpty(patMedInhosp.getHospitaldistrictcodes()));
+ }
+
}
--
Gitblit v1.9.3