zjh 本地 2024/02/27 -3

zjh

2024-02-27 b3df3d5ca95d12742888727e022343e65e39cefa

zjh 本地 2024/02/27 -3

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

@@ -469,17 +469,20 @@


                    Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
                    Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkListMap = addHuaYanTable(tjNumber);
                    tjOrderRemarkObjectMap.putAll(tjOrderRemarkListMap);
                    for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
                        List<TjPdfVO> value = entry.getValue();
                        LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
                        wqqq.eq(TjProject::getProId, entry.getKey().getProId());
                        TjProject one11 = projectService.getOne(wqqq);
                        //判断该项目是否需要打印报告
                        if ("N".equals(one11.getNeedReport())){
                        if (null !=one11 && "N".equals(one11.getNeedReport())){
                            continue;
                        }
                        if ("1".equals(one11.getResultType())) {
                            String titleName = one11.getProName();
                        String titleName =null;
                        if (null !=one11 && "1".equals(one11.getResultType())) {
                             titleName =one11.getProName();
                            // 设置标题字体样式
                            Font titleFonts = PdfUtils.setFont(9);
                            Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
@@ -543,7 +546,12 @@
                            LineSeparator objectName = new LineSeparator();
                            document.add(objectName);
                        } else {
                            String titleName = one11.getProName();
                            if(null !=one11){
                                titleName = one11.getProName();
                            }else {
                                titleName = entry.getKey().getProName();
                            }

                            // 设置标题字体样式
                            Font titleFonts = PdfUtils.setFont(9);
                            Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
@@ -700,7 +708,7 @@
        }
        return AjaxResult.success("该用户体检未完成，不能打印报告！！！");
    }

    //非化验项目报告
    public Map<TjOrderRemark, List<TjPdfVO>> addTable(String tjNumber) {
        //创建map 键为父项目  值为子项目集合
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
@@ -715,6 +723,7 @@
        wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
        //20230323判断项目已检
        wq.ne(TjOrderDetail::getTjStatus, 0);
        wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);

        //遍历体检记录 将项目的具体信息
@@ -731,12 +740,78 @@
        TjCustomer customer = tjCustomerService.getOne(wq22);
        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqq.ne(TjOrderRemark::getDeptId,"241");
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);

            printReport.put(tjOrderRemark,new ArrayList<TjPdfVO>());
        }

        extracted(printReport, tjOrderDetails, customer);
        return printReport;
    }


    //化验项目报告
    public Map<TjOrderRemark, List<TjPdfVO>> addHuaYanTable(String tjNumber) {
        //创建map 键为父项目  值为子项目集合
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();

        //查到该客户的体检记录
//        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
//        wq1.eq(TjOrder::getTjNumber, tjNumber);
//        TjOrder one = tjOrderService.getOne(wq1);

        //拿到体检记录的orderid，查出项目详细信息
//        LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
//        wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
//        //20230323判断项目已检
//        wq.ne(TjOrderDetail::getTjStatus, 0);
//        wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
//        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);

        //遍历体检记录 将项目的具体信息
        //遍历客户所选的项目(包含子项父项)
//        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
//            TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
//            if (null != tjProject) {
//                tjOrderDetail.setProject(tjProject);
//            }
//        }

//        LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
//        wq22.eq(TjCustomer::getCusId, one.getUserId());
//        TjCustomer customer = tjCustomerService.getOne(wq22);
//        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
//        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
//        wqq.eq(TjOrderRemark::getDeptId,"241");
//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);

        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, new ArrayList<TjPdfVO>());
        }

        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {

                    TjPdfVO tjPdfVO = new TjPdfVO();
                    tjPdfVO.setProName(tjOrderDetail.getProName());
                    tjPdfVO.setProResult(tjOrderDetail.getProResult());
                    tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                    tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                    tjPdfVOS.add(tjPdfVO);

            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
        return printReport;
    }

    private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, List<TjOrderDetail> tjOrderDetails, TjCustomer customer) {
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -800,7 +875,6 @@
            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
        return printReport;
    }



 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java

@@ -154,4 +154,8 @@
            "(select pro_id from tj_project where pro_parent_id=#{proParentId})")
    public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId);



    @Select("call pro_lis_sqdbgd(1,#{tjnumber,mode=IN})")
    List<TjOrderDetail> addHuaYanTable(@Param("tjnumber") String tjnumber);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java

@@ -107,4 +107,8 @@
            "\tre.type != 2 and pro.need_report='Y' \n" +
            "\tAND re.tj_number =#{tjNumber}")
    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);


    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
    List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java

@@ -99,4 +99,7 @@
    boolean updateTjOrderDetailsByOrderId(String orderId,String userName, String userId,String ls);

    public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId,Long proParentId);


    List<TjOrderDetail> addHuaYanTable(String tjnumber);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java

@@ -42,4 +42,7 @@

    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);


    List<TjOrderRemark> addHuaYanTable(String tjnumber);

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java

@@ -154,4 +154,9 @@
        return tjOrderDetailMapper.getDetailByOrderIdAndParId(orderId,proParentId);
    }

    @Override
    public List<TjOrderDetail> addHuaYanTable(String tjnumber) {
        return tjOrderDetailMapper.addHuaYanTable(tjnumber);
    }

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java

@@ -82,4 +82,9 @@
        return mapper.cSWebGetProByTjNumAndOrderId(tjNumber);
    }

    @Override
    public List<TjOrderRemark> addHuaYanTable(String tjnumber) {
        return mapper.addHuaYanTable(tjnumber);
    }

}