zjh20250228

zjh

2025-02-28 1e91dc33009cfdc951b2642877f40280b51c3089

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

@@ -2,6 +2,7 @@

import java.io.*;
import java.math.BigDecimal;
import java.sql.Struct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -28,6 +29,7 @@
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.*;
@@ -1352,7 +1354,7 @@
            }
            List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();

            final TjCustomer byId1 = customerService.getById(order.getUserId());
//            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
                //----------------------------------start
//                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
@@ -1380,7 +1382,7 @@
//                        }
//                    }
//                }
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
                qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
@@ -1427,6 +1429,7 @@
//    @Transactional
    @GetMapping("/getParentList")
    @ApiOperation(value = "医生点击体检信息详情(只显示父项目列表)")
//    修改按照科室查询
    public AjaxResult getParentList(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        String userId = SecurityUtils.getLoginUser().getUserId();
        Integer ksId = null;
@@ -1487,15 +1490,13 @@

        String config = configService.selectConfigByKey("qt_open_xdt");
        String byKey = configService.selectConfigByKey("qt_kjksid");
        List<Integer> split = new ArrayList<>(); // 存放转换后的integer类型结果
        Set<Integer> split = new HashSet<>(); // 存放转换后的integer类型结果
        split.add(ksId);
        if ("Y".equals(config)) {
            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
            if (null != roles && !roles.isEmpty()) {
                List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("前台")).collect(Collectors.toList());
                if (!list.isEmpty()) {
//                    if (null != ksId && ksId == 100) {
//                        ksId = 999;
//                    }
                    if (null != byKey && !byKey.isEmpty()) {
                        String[] arr = byKey.split(","); // 根据逗号进行切割
                        for (String s : arr) {
@@ -1503,36 +1504,15 @@
                            split.add(num); // 添加到列表中
                        }
                    }
                } else {
                    split.add(ksId);
                }
            } else {
                split.add(ksId);
            }
        } else {
            split.add(ksId);
        }

//        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.isEmpty() || proIdList.isEmpty()) {
//            return AjaxResult.error("该科室下无项目！");
//        }


            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
            }else {
                list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
            }

            if (null ==list || list.isEmpty()) {
                return AjaxResult.error("该科室下无项目！");
            }
@@ -1542,39 +1522,7 @@
                    tjOrderRemark.setProName(tjProject.getProName());
                }
            }

            return AjaxResult.success(list);


//            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.isEmpty()) {
//                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.isEmpty()) {
//                    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();
//    }

}

@Transactional
@@ -1788,9 +1736,10 @@

    @GetMapping("/getxmjgz")
    @ApiOperation(value = "医生检查处获取项目规则值")
    public AjaxResult getxmjgz(@RequestParam  String proId) {
    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) {
@@ -1802,4 +1751,53 @@
        return AjaxResult.success(list);
    }


    @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);
    }

    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();
                }
            });
        }
        return list;
    }

}