调整pacs检查

zjh

2024-12-21 88c2ff3560c16a0d46493cd3d77ef7acb643bd96

调整pacs检查

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -2043,7 +2043,9 @@
                    }
                } else {
                    if (null != one11) {
                        titleName = one11.getProName();
                        if (entry.getValue().get(0).getProName().contains(";"))
                            titleName = entry.getValue().get(0).getProName();
                        else titleName = one11.getProName();
                    } else {
                        titleName = entry.getKey().getProName();
                    }
@@ -2631,6 +2633,7 @@
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);
        }
        String ids = "";
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
@@ -2640,7 +2643,9 @@
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                    tjOrderDetail.setProject(tjProject);

                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
                            && entry.getKey().getType() == 1
                    && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2653,12 +2658,14 @@
                        tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
                        wrapper.eq(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
                        wrapper.like(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
                        LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
                        if (jcbgd != null){
                            tjPdfVO.setTs(jcbgd.getYxbx());
                            tjPdfVO.setSj(jcbgd.getBgNr());
                            tjPdfVO.setShys(jcbgd.getShysxm());
                            tjPdfVO.setProName(jcbgd.getXmmc());
                            ids+="|"+jcbgd.getXmdm();
                        }
                        tjPdfVOS.add(tjPdfVO);
                    }