From 1e5d108d1f1991b2ddda91a19de5716bee0f306d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 20 七月 2026 16:41:10 +0800
Subject: [PATCH] 【丽水】随访统计科室逻辑调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 22 ++++++++++++++++++----
smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml | 4 +++-
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 2954bb2..caa866b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -573,15 +573,29 @@
if (statisticaltype == 1) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())) {
//鍏ㄩ儴鐥呭尯
- String deptInfo = user.getDeptInfo();
- List<String> leavehospitaldistrictcodes = JSON.parseArray(deptInfo).stream().map(item -> (String) ((List<?>) item).get(0)).collect(Collectors.toList());
+ List<String> leavehospitaldistrictcodes = null;
+ SysUserDept sysUserWard = new SysUserDept();
+ sysUserWard.setUserId(user.getUserId());
+ sysUserWard.setOrgid(user.getOrgid());
+ sysUserWard.setDeptType("2");
+ List<SysUserDept> wardList = sysUserDeptService.selectSysUserDeptList(sysUserWard);
+ if(CollectionUtils.isNotEmpty(wardList)) {
+ leavehospitaldistrictcodes = wardList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
+ }
serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
}
} else if (statisticaltype == 2) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getDeptcodes())) {
//鍏ㄩ儴绉戝
- String hospInfo = user.getHospInfo();
- List<String> deptCodes = JSON.parseArray(hospInfo).stream().map(item -> (String) ((List<?>) item).get(0)).collect(Collectors.toList());
+ List<String> deptCodes = null;
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(user.getUserId());
+ sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setDeptType("1");
+ List<SysUserDept> deptList = sysUserDeptService.selectSysUserDeptList(sysUserDept);
+ if(CollectionUtils.isNotEmpty(deptList)){
+ deptCodes = deptList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
+ }
serviceSubtaskCountReq.setDeptcodes(deptCodes);
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index 915cf2c..80691f9 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -234,7 +234,9 @@
del_flag =1,
update_time = sysdate()
</trim>
- where user_id =#{userId} and dept_code=#{deptCode}
+ where del_flag = 0
+ and user_id =#{userId}
+ and dept_code=#{deptCode}
</update>
<update id="updateSysUserDeptForSync" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept">
--
Gitblit v1.9.3