From 86b103f926cf92fff3d591c6ba07099ad8db3ad1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 01 七月 2025 15:53:04 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 17 +++++++++--------
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 13 +++++++------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index d8ec2bd..e41dc06 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -68,12 +68,13 @@
@PostMapping("/selectPatMedOuthospCount")
@ApiOperation("鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�")
public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
- SysUser user = getLoginUser().getUser();
- List<String> deptCode = new ArrayList<>();
- for (Map<String, Object> map : user.getBelongDepts()) {
- if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
- }
- patMedReq.setDeptcodeList(deptCode);
+// SysUser user = getLoginUser().getUser();
+// List<String> deptCode = new ArrayList<>();
+// for (Map<String, Object> map : user.getBelongDepts()) {
+// if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
+// }
+// patMedReq.setDeptcodeList(deptCode);
+
PatMedRes patMedRes = patMedOuthospService.selectPatMedOuthospCount(patMedReq);
return success(patMedRes);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 4dc28ec..3d84dfb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -130,15 +130,16 @@
PatMedRes patMedRes = null;
// 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
- Long userId = SecurityUtils.getUserId();
- List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
- List<String> deptCode = new ArrayList<>();
- for (SysDept sysDept : sysDepts) {
- deptCode.add(sysDept.getDeptId().toString());
- }
- patMedReq.setDeptcodeList(deptCode);
- patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
+// Long userId = SecurityUtils.getUserId();
+// List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
+// List<String> deptCode = new ArrayList<>();
+// for (SysDept sysDept : sysDepts) {
+// deptCode.add(sysDept.getDeptId().toString());
+// }
+// patMedReq.setDeptcodeList(deptCode);
+// patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
}
+ patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
return patMedRes;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index f9ba7d0..58fe624 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -279,6 +279,7 @@
@Override
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
+ serviceSubtaskVO.setSendstate(null);
serviceSubtaskVO.setPageSize(99999999);
serviceSubtaskVO.setPageNum(1);
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
--
Gitblit v1.9.3