zjh 2024/03/27-1

zjh

2024-03-27 a825d8faec61b2d3582cdb79d256fb1b412a80da

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

@@ -742,7 +742,7 @@
    //非化验项目报告
    public Map<TjOrderRemark, List<TjPdfVO>> addTable(String tjNumber) {
        //创建map 键为父项目  值为子项目集合
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();

        //查到该客户的体检记录
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
@@ -776,7 +776,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");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257","251","271");
        wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

@@ -793,7 +793,7 @@
    //化验项目报告
    public Map<TjOrderRemark, List<TjPdfVO>> addHuaYanTable(String tjNumber) {
        //创建map 键为父项目  值为子项目集合
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
        //查到该客户的体检记录
//        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
//        wq1.eq(TjOrder::getTjNumber, tjNumber);
@@ -828,13 +828,18 @@
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark,null);
        }
        List<Object> toRemoveKeys = new ArrayList<>();
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                    if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProName());
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                            tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
                        }else {
                            tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        }
                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                        tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                        tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
@@ -842,7 +847,10 @@
                    }
            }
            printReport.put(entry.getKey(), tjPdfVOS);
            if(tjPdfVOS.size()==0)
            {toRemoveKeys.add(entry.getKey());}
        }
        toRemoveKeys.forEach(printReport::remove);
        return printReport;
    }