zjh 2024/01/02--1

zjh

2024-01-02 bd6c1c1c6642d57c85816a62d77c25c4e1a66a76

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

@@ -122,7 +122,6 @@
            return AjaxResult.error("请输入科室id");
        }
        //根据当前登陆的人的科室id，获取该科室下的所有项目
        // TODO: 2023/3/24  给超级管理员赋医生检查权限
        List<Long> postIds = sysUser.getPostIds();
        List<Long> ksproList = null;
        if (postIds != null) {
@@ -436,7 +435,6 @@
            return AjaxResult.error("请输入科室id");
        }
        //根据当前登陆的人的科室id，获取该科室下的所有项目
        // TODO: 2023/3/24  给超级管理员赋医生检查权限
        List<Long> postIds = sysUser.getPostIds();
        List<Long> ksproList = null;
        if (postIds != null) {
@@ -837,7 +835,6 @@

            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) {
                // TODO: 2023/8/31 存入每一小项的结果和结论
                //----------------------------------start
                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
@@ -936,9 +933,11 @@
//            return AjaxResult.success(listq);
//        }
        LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
        if (null != sysUser && !sysUser.getUserName().equals("10001")) {
        if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
            wq2.eq(TjProject::getDeptId, ksId);
        }
        //判断该项目是否需要打印报告
        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) {
@@ -1014,6 +1013,10 @@
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject project = projectService.getById(tjOrderDetail.getProId());
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                    continue;
                }
                //病种回显
//                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
//                wq.eq(TjOrderDetailRules::getProId,project.getProId());