zjh20250307

zjh

2025-03-07 cc74c69a0b48dce77cec5674fa42bee768bb28d7

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java

@@ -2,11 +2,13 @@

import java.io.*;
import java.math.BigDecimal;
import java.sql.Struct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -27,13 +29,16 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
import com.ltkj.system.service.*;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
@@ -106,7 +111,7 @@
    @Autowired
    private ITjRulesService tjRulesService;
    @Autowired
    public RedisTemplate<Object,Object> redisTemplate;
    public RedisTemplate<Object, Object> redisTemplate;
    @Resource
    private TestMapper testMapper;
    @Autowired
@@ -117,6 +122,23 @@
    private HisApiGetMethodService hisApiGetMethodService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;


    @GetMapping("/getdangqiandengluyuanqu")
    @ApiOperation("获取当前登录人对应的院区名")
    public AjaxResult getdangqiandengluyuanqu() {
        Long deptId = SecurityUtils.getDeptId();
        if (null != deptId) {
            SysDept dept = deptService.getById(deptId);
            if (null != dept) {
                String hospName = dept.getHospName();
                return AjaxResult.success(hospName);
            }
        }


        return AjaxResult.success();
    }

    /**
     * 该体检科室下客户列表显示接口
@@ -163,8 +185,8 @@
            return AjaxResult.error("请完善科室项目信息");
        }
        List<TjCustomer> customerLis = new ArrayList<>();
        if(null==name) name="";
        if(null==tjNumber) tjNumber="";
        if (null == name) name = "";
        if (null == tjNumber) tjNumber = "";

//        //根据体检号查
//        if (null != tjNumber) {
@@ -319,7 +341,7 @@
//                .match(key).build();
//        RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
//        0未检,1已检
        Map<String,Object> map=null;
        Map<String, Object> map = null;
        if (type == 0) {
//            Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
//            List<TjCustomer> customers = new ArrayList<>();
@@ -383,7 +405,7 @@
            for (Long orderId : orderIds) {
                if (null != orderId) {
                    TjOrder order = orderService.getById(orderId);
                    if(null ==order){
                    if (null == order) {
                        continue;
                    }
                    if (type == 1) {
@@ -410,7 +432,7 @@
                            StringBuilder stringBuilder = new StringBuilder();
                            for (TjOrderRemark remark : list) {
                                TjProject byId = projectService.getById(remark.getProId());
                                if(null !=byId){
                                if (null != byId) {
                                    stringBuilder.append(byId.getProName()).append(";");
                                }
                            }
@@ -439,10 +461,10 @@
    @GetMapping("/huaYangetProList")
    @ApiOperation("化验检查页面列表")
    public AjaxResult huaYangetProList(@ApiParam(value = "体检单号") @RequestParam(required = false) String tjNumber,
                                 @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                 @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                                 @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                 @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
                                       @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                       @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                                       @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                       @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
//        String userId = SecurityUtils.getLoginUser().getUserId();
//        Integer ksId = null;
//        SysUser sysUser = null;
@@ -477,7 +499,7 @@
//        }

//        if(sysUser.getUserName().equals("10001")){
            ksproList = projectService.getHuaYanProId();
        ksproList = projectService.getHuaYanProId();
//        }
//        else {
//            ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
@@ -783,7 +805,7 @@
//                .match(key).build();
//        RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
//        0未检,1已检
        Map<String,Object> map=null;
        Map<String, Object> map = null;
        if (type == 0) {
//            Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
//            List<TjCustomer> customers = new ArrayList<>();
@@ -829,10 +851,10 @@
    @GetMapping("/yingXiangGetProList")
    @ApiOperation("影像检查页面列表")
    public AjaxResult yingXiangGetProList(@ApiParam(value = "体检单号") @RequestParam(required = false) String tjNumber,
                                       @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                       @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                                       @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                       @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
                                          @ApiParam(value = "0未检,1已检") @RequestParam(defaultValue = "0") Integer type,
                                          @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                                          @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                          @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
/*        String userId = SecurityUtils.getLoginUser().getUserId();
        Integer ksId = null;
        SysUser sysUser = null;
@@ -1025,7 +1047,7 @@
//            }
//        }
//        List<TjCustomer> customerLists = null;
        Map<String,Object> map=null;
        Map<String, Object> map = null;
        if (type == 0) {
//            Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
//            List<TjCustomer> customers = new ArrayList<>();
@@ -1085,7 +1107,7 @@

        String format = DateUtil.format(patbirth, "yyyy.MM.dd");

        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null);
        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
        return AjaxResult.success(tjYxjcList);
    }

@@ -1100,9 +1122,6 @@
//        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
//        return AjaxResult.success(tjYxjcList);
//    }





    /**
@@ -1276,9 +1295,9 @@
        dept.setUpdateBy(getUsername());

        //查询院区名字赋值
        if (dept.getHospId()!=null){
        if (dept.getHospId() != null) {
            final DictHosp byId = dictHospService.getById(dept.getHospId());
            if (byId!=null){
            if (byId != null) {
                dept.setHospName(byId.getHospAreaName());
            }
        }
@@ -1315,14 +1334,17 @@
    public AjaxResult addRemark(@ApiParam(value = "体检父项目备注集合") @RequestBody List<TjOrderRemark> remarklList) {
        Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
        SysUser sysUser = userService.getById(userId);
        if (remarklList == null || remarklList.size() == 0) {
        if (remarklList == null || remarklList.isEmpty()) {
            return AjaxResult.success("操作失败");
        }
        for (TjOrderRemark orderRemark : remarklList) {
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
            if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            } else {
                orderRemark.setSummary(null);
            }
            if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
            qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
            TjOrder order = orderService.getOne(qw);
@@ -1332,35 +1354,35 @@
            }
            List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();

            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) {
//            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
                //----------------------------------start
                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
                    //给病种记录表存 方便统计病种和客户信息之间的关系
                    if (tjOrderDetail.getRulesList()!=null){
                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
                            orderDetailRules.setAid(tjRules.getAid());
                            if (byId1!=null){
                                orderDetailRules.setCusName(byId1.getCusName());
                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
                            }
                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
                            orderDetailRules.setDoctorName(sysUser.getNickName());
                            orderDetailRules.setTjNumber(order.getTjNumber());
                            if (byId!=null){
                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
                                orderDetailRules.setProName(byId.getProName());
                            }
                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
                            tjOrderDetailRulesService.save(orderDetailRules);
                        }
                    }
                }
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
//                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
//                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
//                    //给病种记录表存 方便统计病种和客户信息之间的关系
//                    if (tjOrderDetail.getRulesList()!=null){
//                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
//                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
//                            orderDetailRules.setAid(tjRules.getAid());
//                            if (byId1!=null){
//                                orderDetailRules.setCusName(byId1.getCusName());
//                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
//                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
//                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
//                            }
//                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
//                            orderDetailRules.setDoctorName(sysUser.getNickName());
//                            orderDetailRules.setTjNumber(order.getTjNumber());
//                            if (byId!=null){
//                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
//                                orderDetailRules.setProName(byId.getProName());
//                            }
//                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
//                            tjOrderDetailRulesService.save(orderDetailRules);
//                        }
//                    }
//                }
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
                qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
@@ -1378,21 +1400,23 @@
                    remarkService.save(remark);
                } else {
                    one.setRemark(orderRemark.getRemark());
                    if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                    if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    } else {
                        one.setSummary(null);
                    }
//                    one.setDeptId(orderRemark.getDeptId());
                    one.setDoctorName(orderRemark.getDoctorName());
                    one.setType(1);
                    remarkService.updateById(one);
                }
                asyncService.updateCheckType(orderRemark.getTjNumber());
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
            }
            asyncService.updateCheckType(orderRemark.getTjNumber());
            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
//            asyncService.updateCheckType(orderRemark.getTjNumber());
//            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
        }
        remarkService.tjYishengjianchajianyi(null, null, null, null);
        return AjaxResult.success("操作成功");
    }

@@ -1405,6 +1429,7 @@
//    @Transactional
    @GetMapping("/getParentList")
    @ApiOperation(value = "医生点击体检信息详情(只显示父项目列表)")
//    修改按照科室查询
    public AjaxResult getParentList(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        String userId = SecurityUtils.getLoginUser().getUserId();
        Integer ksId = null;
@@ -1417,261 +1442,158 @@
            ksId = Math.toIntExact(sysUser.getDeptId());
        }
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
        if (configByKey.equals("Y")){
            // 判断是否收费 请求接口
            LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
            TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
            LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
            tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
            TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
        // 判断是否收费 请求接口
        TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
        if (null == tjOrder) {
            return AjaxResult.error("未找到体检记录");
        }

                HashMap<String, Object> hisRequestParams = new HashMap<>();
                // 不在需要身份证号
                hisRequestParams.put("patientId",tjOrder.getCardId());
                log.info("ltkj--- "+DateUtil.date()+"操作人id: "+userId+"操作科室: "+sysUser.getDeptId()+"操作的体检人: "+tjNumber);
            AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
//                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
//                    BigDecimal cateFeeAll = BigDecimal.ZERO;
//                    for (Map<String, String> datum : data) {
//                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
//                        cateFeeAll = cateFeeAll.add(cateFee);
//                    }
//                    BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
//                    if (cateFeeAll.compareTo(fyhj) != 0){
        SysDept dept = deptService.getById(ksId);

        if(null !=dept && !dept.getDeptName().contains("体检中心")){
            LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
            tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
            TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
            if (null != tjFlowingWater) {
                if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
                    if (configByKey.equals("Y")) {
                        HashMap<String, Object> hisRequestParams = new HashMap<>();
                        // 不在需要身份证号
                        hisRequestParams.put("patientId", tjOrder.getCardId());
                        log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber);
                        AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                        if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                            int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
                            if (sfsf > 0) {
                                log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就单数  " + sfsf);
                                log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                                return AjaxResult.error("存在未缴费项目");
                            }
                            extracted(tjOrder, tjFlowingWater);
                        } else {
                            log.error("路泰科技--- " + DateUtil.date() + " 未查询到缴费记录的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                            return AjaxResult.error("未查询到缴费记录");
                        }
                    }
//                String s = configService.selectConfigByKey("is_request_common_his_api");
//                if (null != s && s.equals("Y")) {
//                    LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
//                    wrapper1.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
//                    wrapper1.eq(TjFlowingWater::getPayStasus, 0L);
//                    List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
//                    if (!list.isEmpty()) {
//                        return AjaxResult.error("存在未缴费项目");
//                    }

                    int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
                    if (sfsf > 0){
                        log.error("路泰科技---  "+DateUtil.date()+" 存在未缴费项目的 就单数  "+sfsf);
                        log.error("路泰科技---  "+DateUtil.date()+" 存在未缴费项目的 就诊号  "+tjOrder.getCardId()+" 体检号 "+tjOrder.getTjNumber());
                        return AjaxResult.error("存在未缴费项目");
                    }

                    extracted(tjOrder, tjFlowingWater);
                }else {
                    log.error("路泰科技--- "+DateUtil.date()+" 未查询到缴费记录的 就诊号  "+tjOrder.getCardId()+" 体检号 "+tjOrder.getTjNumber());
                    return AjaxResult.error("未查询到缴费记录");
//                }
                }
//            }
            } else {
                log.error("路泰科技--- " + DateUtil.date() + " 未对接his接口 " + " 体检号 " + tjOrder.getTjNumber());
                return AjaxResult.error("未查询到缴费记录");
            }
        }

        String config = configService.selectConfigByKey("qt_open_xdt");
        String byKey = configService.selectConfigByKey("qt_kjksid");
        List<Integer> split = new ArrayList<>(); // 存放转换后的integer类型结果
        if("Y".equals(config)){
        Set<Integer> split = new HashSet<>(); // 存放转换后的integer类型结果
        split.add(ksId);
        if ("Y".equals(config)) {
            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
            if(null !=roles && roles.size()>0){
            if (null != roles && !roles.isEmpty()) {
                List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("前台")).collect(Collectors.toList());
                if(list.size()>0){
                    if(null !=ksId && ksId==100){
                        ksId=999;
                    }
                    if(null !=byKey && !"".equals(byKey)){
                if (!list.isEmpty()) {
                    if (null != byKey && !byKey.isEmpty()) {
                        String[] arr = byKey.split(","); // 根据逗号进行切割
                        for (String s : arr) {
                            int num = Integer.parseInt(s); // 将每个子字符串转换为integer类型
                            split.add(num); // 添加到列表中
                        }
                    }
                }else {
                    split.add(ksId);
                }
            }
        }
            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
            }else {
                split.add(ksId);
                list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
            }
        }else {
            split.add(ksId);
        }
            if (null ==list || list.isEmpty()) {
                return AjaxResult.error("该科室下无项目！");
            }
            for (TjOrderRemark tjOrderRemark : list) {
                TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
                if (null != tjProject) {
                    tjOrderRemark.setProName(tjProject.getProName());
                }
            }
            return AjaxResult.success(list);
}

        //判断当前登陆的人是不是管理员。管理员可以看当前体检号下所有项目
//        if (sysUser.getUserName().equals("10001")) {
//            QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>();
//            wqq.eq("tj_number", tjNumber);
//            List<TjOrderRemark> listq = remarkService.list(wqq);
//            if (listq.size() == 0) {
//                return AjaxResult.error("该科室下无项目！");
//            }
//            for (TjOrderRemark tjOrderRemark : listq) {
//                TjProject tjProjectq = projectService.getById(tjOrderRemark.getProId());
//                if (null != tjProjectq) {
//                    tjOrderRemark.setProName(tjProjectq.getProName());
//                }
//            }
//            return AjaxResult.success(listq);
//        }
        LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
        if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
            wq2.in(TjProject::getDeptId,split);
        }
        //判断该项目是否需要打印报告
        wq2.eq(TjProject::getNeedReport,"Y");
        List<TjProject> Deptlist = projectService.list(wq2);
        List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
        if (Deptlist.size() == 0 || proIdList.size() == 0) {
            return AjaxResult.error("该科室下无项目！");
        }
        LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
        wqqq.eq(TjOrder::getTjNumber, tjNumber);
        TjOrder one = orderService.getOne(wqqq);
        if (null != one) {
            LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
            wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
            wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
            wqq.in(TjOrderDetail::getProId, proIdList);
            wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
            List<TjOrderDetail> detailList = detailService.list(wqq);
            if (detailList != null && detailList.size() > 0) {
                List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
                QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
                wq.eq("tj_number", tjNumber);
                wq.in("pro_id", collect);
                wq.ne("type", 2);
                wq.ne("dept_id",241);
                wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
                List<TjOrderRemark> list = remarkService.list(wq);
                if (list.size() == 0) {
                    return AjaxResult.success("该科室下无项目！");
                }
                for (TjOrderRemark tjOrderRemark : list) {
                    TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
                    if (null != tjProject) {
                        tjOrderRemark.setProName(tjProject.getProName());
                    }
                }
                return AjaxResult.success(list);
            }
            return AjaxResult.success();
        }
        return AjaxResult.error();
@Transactional
public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
    tjFlowingWater.setPayStasus(1L);
    tjFlowingWater.setPayType(0L);
    tjFlowingWater.setTollCollectorId("148");
    tjFlowingWaterService.updateById(tjFlowingWater);
    Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
    LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
    tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
    List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
    List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
    LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
    tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId, tjSerialNumber);
    tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId, detailIds);
    detailService.update(tjOrderDetailLambdaUpdateWrapper);
    remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
}

/**
 * 点击父项目显示子项目详情
 *
 * @return
 */
@GetMapping("/getOrderDetailByProParentId")
@ApiOperation("点击父项目显示子项目详情")
public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "父项目id") @RequestParam String proParentId,
                                              @ApiParam(value = "体检号") @RequestParam String tjNumber) {
    if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
        return AjaxResult.error("获取用户信息错误");
    }

    @Transactional
    public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
        tjFlowingWater.setPayStasus(1L);
        tjFlowingWater.setPayType(0L);
        tjFlowingWater.setTollCollectorId("148");
        tjFlowingWaterService.updateById(tjFlowingWater);
        Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
        LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
        tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
        List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
        List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
        LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
        tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
        tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
        detailService.update(tjOrderDetailLambdaUpdateWrapper);
    TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);

    List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);

    if (null == proParentList || proParentList.isEmpty()) {
        Map<String, Object> map = new HashMap<>();
        map.put("xiaoJieIds", null);
        map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId)));
        map.put("xiaoJie", null);
        map.put("remark", remark.getRemark());
        return AjaxResult.success(map);
    }

    /**
     * 点击父项目显示子项目详情
     *
     * @return
     */
    @GetMapping("/getOrderDetailByProParentId")
    @ApiOperation("点击父项目显示子项目详情")
    public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "父项目id") @RequestParam String proParentId,
                                                  @ApiParam(value = "体检号") @RequestParam String tjNumber) {
        if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
            return AjaxResult.error("获取用户信息错误");
        }

//        if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
//            Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
//            return AjaxResult.success(mapValue);
//        }

        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);

//        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);

        if (null == proParentList || proParentList.size()==0) {
            Map<String, Object> map = new HashMap<>();
            map.put("xiaoJieIds", null);
            map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
            map.put("xiaoJie", null);
            map.put("remark", remark.getRemark());
            return AjaxResult.success(map);
        }
        List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
        TjOrder one = orderService.getOrderByTjNum(tjNumber);
        if (null == one) {
            return AjaxResult.success("该用户暂时没有体检数据");
        }
        List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
        List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
        TjCustomer customer = tjCustomerService.getById(one.getUserId());
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject project = projectService.getById(tjOrderDetail.getProId());
    List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
    TjOrder one = orderService.getOrderByTjNum(tjNumber);
    if (null == one) {
        return AjaxResult.success("该用户暂时没有体检数据");
    }
    List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
    List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
//        TjCustomer customer = tjCustomerService.getById(one.getUserId());
    if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
            TjProject project = projectService.getById(tjOrderDetail.getProId());
            if(null != project){
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                if ("N".equals(project.getNeedReport())) {
                    continue;
                }
                //病种回显
//                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
//                wq.eq(TjOrderDetailRules::getProId,project.getProId());
//                wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
//                List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
//                List<TjRules> res=new ArrayList<>();
//                for (TjOrderDetailRules orderDetailRules : list) {
//                    final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
//                    res.add(byId);
//                }
                List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
                tjOrderDetail.setRulesList(rulesList);

                //查标准和单位----start
//                List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
//                if (list26.size() == 0) {
//                    project.setProMetering("/");
//                    project.setProScope("/");
//                } else if (list26.size() == 1) {
//                    project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
//                    project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
//                } else {
//                    Long cusSex = customer.getCusSex();
//                    Date cusBrithday = customer.getCusBrithday();
//                    int age = DateUtil.ageOfNow(cusBrithday);
//                    for (TjStandard tjStandard : list26) {
//                        LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
//                        if (tjStandard.getTjSex() != null) {
//                            wq8.eq(TjStandard::getTjSex, cusSex);
//                        }
//                        if (tjStandard.getTjType() != null) {
//                            wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
//                        }
//                        TjStandard standard = tjStandardService.getOne(wq8);
//                        project.setProMetering(standard.getCompany());
//                        project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
//                    }
//                }
                //查标准和单位-----end
                tjOrderDetail.setProject(project);
//                List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
//                if (list2.size() == 0) {
//                    tjOrderDetail.setStandard(null);
//                } else if (list2.size() == 1) {
//                    tjOrderDetail.setStandard(list2.get(0));
//                } else {
//                    for (TjStandard tjStandard : list2) {
//                        LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
//                        if (tjStandard.getTjSex() != null) {
//                            wq8.eq(TjStandard::getTjSex, customer.getCusSex());
//                        }
//                        if (tjStandard.getTjType() != null) {
//                            wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
//                        }
//                        TjStandard standard = tjStandardService.getOne(wq8);
//                        tjOrderDetail.setStandard(standard);
//                    }
//                }
                tjOrderDetail.setResultType(project.getResultType());
                if (null != remark.getDoctorName()) {
                    //lg0412
                    SysUser byId = userService.getById(remark.getDoctorName());
                    if (byId != null) {
                        tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
@@ -1679,112 +1601,208 @@
                } else {
                    tjOrderDetail.setDoctorName(null);
                }
                if(StringUtil.isBlank(tjOrderDetail.getProResult())){
                    tjOrderDetail.setProResult(project.getProDefault());
                }
                tjOrderDetailList.add(tjOrderDetail);
            }
        }
        Map<String, Object> map = new HashMap<>();
        List<TjAdvice> adviceList = new ArrayList<>();
        if (null != remark) {
            String[] strings = StringUtils.split(remark.getSummary(), ";");
//            if (null != strings && strings.length > 0) {
//                for (String string : strings) {
//                    adviceList.add(tjAdviceService.getById(string));
//                }
//            }
            if(null !=strings && strings.length>0){
                List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
                adviceList.addAll(list);
            }
            map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
        } else {
            map.put("xiaoJieIds", null);
    }
    Map<String, Object> map = new HashMap<>();
    List<TjAdvice> adviceList = new ArrayList<>();
    if (null != remark) {
        String[] strings = StringUtils.split(remark.getSummary(), ";");
        if (null != strings && strings.length > 0) {
            List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
            adviceList.addAll(list);
        }
        map.put("sons", tjOrderDetailList);
        map.put("xiaoJie", adviceList);
        map.put("remark", remark.getRemark());
        map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
    } else {
        map.put("xiaoJieIds", null);
    }
    map.put("sons", tjOrderDetailList);
    map.put("xiaoJie", adviceList);
    map.put("remark", remark.getRemark());

//        asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
        return AjaxResult.success(map);
    }
    return AjaxResult.success(map);
}

    /**
     * 状态修改
     */
    @PutMapping("/changeStatus")
    @ApiOperation("部门状态修改")
    public AjaxResult changeStatus(@RequestBody SysDept dept) {
        //判断是启用还是
        if ("1".equals(dept.getStatus())) {
            //判断用户表中有没有人在该科室下
            LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
            wq.eq(SysUser::getDeptId, dept.getDeptId());
            List<SysUser> list = userService.list(wq);
            if (list.size() != 0) {
                return AjaxResult.error("该科室下有工作人员，不能停用！");
            }
/**
 * 状态修改
 */
@PutMapping("/changeStatus")
@ApiOperation("部门状态修改")
public AjaxResult changeStatus(@RequestBody SysDept dept) {
    //判断是启用还是
    if ("1".equals(dept.getStatus())) {
        //判断用户表中有没有人在该科室下
        LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
        wq.eq(SysUser::getDeptId, dept.getDeptId());
        List<SysUser> list = userService.list(wq);
        if (!list.isEmpty()) {
            return AjaxResult.error("该科室下有工作人员，不能停用！");
        }
        dept.setUpdateBy(getUsername());
        int i = deptService.updateDeptStatus(dept);
        if (i == 0) {
            return AjaxResult.error("修改失败");
        }
        return AjaxResult.success("修改成功");

    }
    dept.setUpdateBy(getUsername());
    int i = deptService.updateDeptStatus(dept);
    if (i == 0) {
        return AjaxResult.error("修改失败");
    }
    return AjaxResult.success("修改成功");

}


    /**
     * 根据项目id获取建议
     */
    @GetMapping("/getDeptAdvice/{proId}")
    @ApiOperation(value = "根据项目id获取建议")
    public AjaxResult getDeptAdvice(@ApiParam(value = "父项目项目id") @PathVariable String proId) {
        List<TjAdvice> list = new ArrayList<>();
        LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
/**
 * 根据项目id获取建议
 */
@GetMapping("/getDeptAdvice")
@ApiOperation(value = "根据项目id获取建议")
public AjaxResult getDeptAdvice(@ApiParam(value = "父项目项目id") @RequestParam(required = false) String proId,
                                @ApiParam(value = "内容") @RequestParam(required = false) String nr,
                                @ApiParam(value = "拼音码") @RequestParam(required = false) String pym,
                                @ApiParam(value = "页码") @RequestParam(defaultValue = "1") int page,
                                @ApiParam(value = "每页展示条数") @RequestParam(defaultValue = "10") int pageSize) {
    LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
    if (null != proId) {
        wq1.eq(TjAdvice::getProId, proId);
        List<TjAdvice> list1 = tjAdviceService.list(wq1);
        //如果没有项目id  就返回所有的建议集合
        if (list1.size() == 0) {
            return AjaxResult.success(tjAdviceService.list());
    }
    if (null != nr && !nr.isEmpty()) {
        wq1.like(TjAdvice::getTitle, nr);
    } else if (null != pym && !pym.isEmpty()) {
        wq1.like(TjAdvice::getTitle, pym);
    }
//        else {
//            wq1.last("limit 20");
//        }
    Page<TjAdvice> pages = new Page<>(page, pageSize);
    Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
    Map<String, Object> map = new HashMap<>();
    map.put("list", advicePage.getRecords());
    map.put("total", advicePage.getTotal());
//        List<TjAdvice> list = tjAdviceService.list(wq1);
    return AjaxResult.success(map);
}


@GetMapping("/getAdviceByTjNumAndPro")
@ApiOperation(value = "根据项目id和体检号获取建议")
public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "父项目项目id") @RequestParam String proId,
                                         @ApiParam(value = "体检号") @RequestParam String tjNum) {
    LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
    wq.eq(TjOrderRemark::getProId, proId);
    wq.eq(TjOrderRemark::getTjNumber, tjNum);
    TjOrderRemark remark = remarkService.getOne(wq);
    List<TjAdvice> list = null;
    if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
        String[] strings = StringUtils.split(remark.getSummary(), ";");
        if (null != strings && strings.length > 0) {
            list = tjAdviceService.getAdviceStringByIds(strings);
        }
        for (TjAdvice tjAdvice : list1) {
            list.add(tjAdvice);
    }
    return AjaxResult.success(list);
}


/**
 * 获取部门树列表
 */
//@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/deptTree")
@ApiOperation("获取部门树列表")
public AjaxResult deptTree(SysDept dept) {
    return success(deptService.selectDeptTreeList(dept));
}


@GetMapping("/deptTree111")
@ApiOperation("获取部门树列表1111111111")
public AjaxResult deptTree111(SysDept dept) {
    final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
    return success(treeSelects);
}


/**
 * 获取子科室部门列表
 */
@GetMapping("/getChildList")
@ApiOperation(value = "获取子科室部门列表")
public AjaxResult getChildList(String deptName) {
    LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
    wq.ne(SysDept::getParentId, 0);
    if (deptName != null) {
        wq.like(SysDept::getDeptName, deptName);
    }
    List<SysDept> depts = deptService.list(wq);
    return success(depts);
}

    @GetMapping("/getxmjgz")
    @ApiOperation(value = "医生检查处获取项目规则值")
    public AjaxResult getxmjgz(@RequestParam  String proId,@RequestParam(required = false)  String xmgz) {
        LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
        wq.eq(TjRules::getProId, proId);
        if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
        List<TjRules> list = tjRulesService.list(wq);
        if(null !=list && !list.isEmpty()){
            for (TjRules tjRules : list) {
                if(null !=tjRules){
                    tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
                }
            }
        }
        return AjaxResult.success(list);
    }

    /**
     * 获取部门树列表
     */
    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
    @GetMapping("/deptTree")
    @ApiOperation("获取部门树列表")
    public AjaxResult deptTree(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));

    @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
    @ApiOperation (value = "医生检查页面查询检验检查项目接口")
    public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "体检号") @RequestParam String tjNumber) {
//        List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
//        List<CsProVo> list = new ArrayList<>();
//        if (null != orderRemarkList && orderRemarkList.size() > 0) {
//            for (TjOrderRemark remark : orderRemarkList) {
//                CsProVo vo = new CsProVo();
//                vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
//                vo.setProName(projectService.getById(remark.getProId()).getProName());
//                vo.setType(remark.getType());
//                if (null != remark.getDoctorName()) {
//                    vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
//                    vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
//                }
//                vo.setSffs("统收");
//                vo.setIsPay("已收费");
//                vo.setQdcreateTime(remark.getCreateTime());
//                vo.setBcupdateTime(remark.getUpdateTime());
//                vo.setZhupdateTime(remark.getUpdateTime());
//                list.add(vo);
//            }
//            List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
//            Collections.sort(list, new Comparator<CsProVo>() {
//                @Override
//                public int compare(CsProVo o1, CsProVo o2) {
//                    return o1.getType() - o2.getType();
//                }
//            });
//        }

        List<CsProVo> list = getysjcProVos(tjNumber);
        return AjaxResult.success(list);
    }


    @GetMapping("/deptTree111")
    @ApiOperation("获取部门树列表1111111111")
    public AjaxResult deptTree111(SysDept dept) {
        final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
        return success(treeSelects);
    }


    /**
     * 获取子科室部门列表
     */
    @GetMapping("/getChildList")
    @ApiOperation(value = "获取子科室部门列表")
    public AjaxResult getChildList(String deptName) {
        LambdaQueryWrapper<SysDept> wq=new LambdaQueryWrapper<>();
        wq.ne(SysDept::getParentId,0);
        if (deptName!=null){
            wq.like(SysDept::getDeptName,deptName);
    public List<CsProVo> getysjcProVos(String tjNumber) {
        List<CsProVo> list = remarkService.ysjcGetProByTjNumAndOrderId(tjNumber);
        if (null != list && !list.isEmpty()) {
            list.sort(new Comparator<CsProVo>() {
                @Override
                public int compare(CsProVo o1, CsProVo o2) {
                    return o1.getType() - o2.getType();
                }
            });
        }
        List<SysDept> depts = deptService.list(wq);
        return success(depts);
        return list;
    }

}