zjh 本地 2024/02/28 -2

zjh

2024-02-28 fcc5d56c4fa7b269d96b8ef66a527fa6a7c90450

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

@@ -724,6 +724,7 @@
        //20230323判断项目已检
        wq.ne(TjOrderDetail::getTjStatus, 0);
        wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
        wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);

        //遍历体检记录 将项目的具体信息
@@ -741,6 +742,7 @@
        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqq.ne(TjOrderRemark::getDeptId,"241");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
@@ -800,6 +802,7 @@
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                        tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                        tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
                        tjPdfVOS.add(tjPdfVO);
                    }
            }