【丽水】病区Json

陈昶聿

21 小时以前 d6d3e4287589f0be15181e8daf5c8eedf2c23d51

 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 hospInfo = user.getHospInfo();
                    Gson gson = new Gson();
                    // 3. 定义 List 类型（核心）
                    TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
                    List<String> leavehospitaldistrictcodes = gson.fromJson(hospInfo, typeToken.getType());
                    serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
                }
            }else if(statisticaltype==2){
                if(CollectionUtils.isEmpty(serviceSubtaskCountReq.getDeptcodes())){
                    //全部科室
                    String deptInfo = user.getDeptInfo();
                    Gson gson = new Gson();
                    // 3. 定义 List 类型（核心）
                    TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
                    List<String> deptCodes = gson.fromJson(deptInfo, 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);
                    }
                }
            }
        }