zjh20250217

zjh

2025-02-17 206a888c39eed2c58f4dab3c5bfcac7f068a0ea9

zjh20250217

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

@@ -1125,7 +1125,78 @@
        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
        if (null != ycxms && !ycxms.isEmpty()) {
            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {

            Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));

            for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
                List<TjOrderYcxm> details = entry.getValue();
                if(null !=details && !details.isEmpty()){
                    details= details.stream()
                            .sorted(Comparator.comparing(TjOrderYcxm::getJcxm))
                            .collect(Collectors.toList());
                    boolean isXmWrite = false;
                    int index = 1;
                    int index1 = 1;
                    for (TjOrderYcxm detail : details) {
                        String xmmc = entry.getKey().toString();
                        if (!isXmWrite) {
                            xmXh++;
                            paragraph = new Paragraph("【" + xmXh + "." + xmmc + "】", defaultFont);
                            paragraph.setAlignment(Element.ALIGN_LEFT);
                            document2.add(paragraph);
                            isXmWrite = true;
                        }
                        String result = detail.getJcjg();
                        if (StrUtil.isNotBlank(result)) {
                            StringBuilder builder = new StringBuilder();
                            if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
                            builder.append("    (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
                            index1++;

                            result = builder.toString();
                        }
                        if (StrUtil.isNotBlank(result)) {
                            paragraph = new Paragraph(result, defaultFont);
                            paragraph.setAlignment(Element.ALIGN_LEFT);
                            document2.add(paragraph);
                        } else {
                            paragraph = new Paragraph("建议定期复查", defaultFont);
                            paragraph.setAlignment(Element.ALIGN_LEFT);
                            document2.add(paragraph);
                        }
                        String str = "     ";
                        List<Map<String, Object>> maps = new ArrayList<>();

                            String jynr = detail.getJynr();
                            JSONArray array = JSONUtil.parseArray(jynr);
                            for (Object object : array) {
                                Map<String,Object> objectMap=new HashMap<>();
                                JSONObject jsonObject = (JSONObject) object;
                                String bt = jsonObject.getStr("bt");
                                String nr = jsonObject.getStr("nr");
                                objectMap.put("bt",bt);
                                objectMap.put("nr",nr);
                                if(null !=bt || null !=nr) maps.add(objectMap);
                            }
                            List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
                            for (Map<String, Object> objectMap : collect1) {
                                String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
                                if (StrUtil.isBlank(content)) content = "     ";
                                paragraph = new Paragraph(content, defaultFont);
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                document2.add(paragraph);
                            }
                        index++;
                        paragraph = PdfUtils.setParagraph(defaultFont, "");
                        paragraph.setLeading(0f);
                        paragraph.setSpacingBefore(0f);
                        paragraph.setSpacingAfter(5f);
                        document2.add(paragraph);
                    }
                }
            }

            /*for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
                List<CsProVo> proVos = deptEntry.getValue();
                if (proVos.size() > 1) {
                    proVos = proVos.stream()
@@ -1277,7 +1348,7 @@
                        }
                    }
                }
            }
            }*/
        } else {
            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
                List<CsProVo> proVos = deptEntry.getValue();

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

@@ -1037,7 +1037,7 @@
            }
            tjReservation.setIsExpire(1);
            tjReservationService.updateById(tjReservation);
            if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
            if (null != tjReservation.getTeamNo()) {
                tjOrder.setTjType("1");
            } else if (tjOrder.getTjType().equals("2")) {
                tjOrder.setTjType("2");
@@ -1349,6 +1349,7 @@

            // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs

            log.info("签到登记接口该人员的体检类型是:"+tjOrder.getTjType());
            if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                log.info("签到登记进入未收费方法");
                // 这是上面个人方法引入数据

 ltkj-admin/src/main/resources/application.yml

@@ -9,6 +9,7 @@
#  win-xamjyyprod
#  win-xamjyytest
#  win-chkwyyprod
#  win-chkwyytest
#  win-pbkwyyprod
# 陕健医澄合矿务局中心医院正式 5001
# 陕健医澄合矿务局中心医院测试 5002