From d6d3e4287589f0be15181e8daf5c8eedf2c23d51 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 05 六月 2026 15:03:28 +0800
Subject: [PATCH] 【丽水】病区Json
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 56c6428..0f3c6be 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.alibaba.fastjson.JSON;
import com.github.pagehelper.ISelect;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -91,6 +92,9 @@
@Value("${spring.profiles.active}")
private String active;
+
+ @Value("${isAdmin}")
+ private List<Long> isAdmin;
@Autowired
private RedisCache redisCache;
@@ -552,25 +556,25 @@
if(ObjectUtils.isNotEmpty(statisticaltype)){
SysUser user = getLoginUser().getUser();
- if(statisticaltype==1){
- if(CollectionUtils.isEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())){
- //鍏ㄩ儴鐥呭尯
- String deptInfo = user.getDeptInfo();
- Gson gson = new Gson();
- // 3. 瀹氫箟 List 绫诲瀷锛堟牳蹇冿級
- TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
- List<String> leavehospitaldistrictcodes = gson.fromJson(deptInfo, typeToken.getType());
- serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
- }
- }else if(statisticaltype==2){
- if(CollectionUtils.isEmpty(serviceSubtaskCountReq.getDeptcodes())){
- //鍏ㄩ儴绉戝
- String hospInfo = user.getHospInfo();
- Gson gson = new Gson();
- // 3. 瀹氫箟 List 绫诲瀷锛堟牳蹇冿級
- TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
- List<String> deptCodes = gson.fromJson(hospInfo, typeToken.getType());
- serviceSubtaskCountReq.setDeptcodes(deptCodes);
+ if(!isAdmin.contains(user.getUserId())){
+ 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());
+ 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());
+ serviceSubtaskCountReq.setDeptcodes(deptCodes);
+ }
}
}
}
--
Gitblit v1.9.3