zjh 2024/04/25-1

zjh

2024-04-25 a74b5ffd9c25edd8096220920934e3e42f62cc23

 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<>();
@@ -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);
@@ -835,7 +835,11 @@
                    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());