pacs检查去重

zhaowenxuan

2024-12-11 4c3dee61da422e98ec1b9d798a77f47d8d45f7b6

pacs检查去重

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

@@ -1190,6 +1190,7 @@
                strings.add(ycbz);
                strings.add(jgdw);
                strings.add(fwz);
                strings.add(hybgd.getJcxmid());
                lists.add(strings);
            }
            if (!lists.isEmpty()) {
@@ -1398,11 +1399,9 @@
//                            i -> i,
//                            (existing, replacement) -> existing
//                    ))
//                    .values()); // 获取去重后的 List
//                    .values());
            tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
            System.out.println("tjOrderDetails = " + JSONUtil.toJsonStr(tjOrderDetails));
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values()); // 获取去重后的 List
            System.out.println("tjOrderDetails = " + JSONUtil.toJsonStr(tjOrderDetails));
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -1449,6 +1448,7 @@
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -1669,7 +1669,10 @@
                    isYc = true;
                }
            }
            int index = 1;
            for (String s : list) {
                // 跳过项目id
                if (index == 6) continue;
                PdfPCell nameCell = new PdfPCell();
                nameCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
                nameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
@@ -1685,6 +1688,7 @@
                    nameCell.setPhrase(new Paragraph(s, textFont));
                }
                table.addCell(nameCell);
                index++;
            }
        }
        document.add(table);

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

@@ -2628,7 +2628,8 @@


    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
//        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
        AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
        if (!ajaxResult.get("code").toString().equals("200")) {
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } else {