zjh20250121

zjh

2025-01-21 6a7389dea30ef63c60b2cfdb93474092acbede3f

zjh20250121

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

@@ -1136,9 +1136,9 @@
                                builder.append("    (").append(index1).append(")").append(s).append("\n");
                                index1++;
                            }
                            if (!contains) builder.append("    (").append(index1).append(")").append("本报告仅对本次检查负责，临床医生依据病情如有疑问，请及时复查或进一步检查");
//                            if (!contains) builder.append("    (").append(index1).append(")").append("本报告仅对本次检查负责，临床医生依据病情如有疑问，请及时复查或进一步检查");
//                            if (!contains) builder.append("    (").append(index1).append(")").append(" ");
                            else builder.substring(0,builder.length() - 1);
//                            else builder.substring(0,builder.length() - 1);
                            result = builder.toString();
                        }
//                String content = "  (" + index + ") " + detail.getProName() + "：" + result;
@@ -1155,12 +1155,14 @@
                            document2.add(paragraph);
                        }
                        String str = "     ";
                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
                                detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                        .replaceAll("[ 测定检测]",""),detail.getProResult());
//                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
//                                detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
//                                        .replaceAll("[ 测定检测]",""),detail.getProResult());
                        List<Map<String, Object>> maps =new ArrayList<>();
                        if(detail.getDeptId().equals("2")){
                            String[] split = result.split("。");
                            String[] split = result.split("。|,|，");
                            for (String s : split) {
                                s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");
//                                Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
                                Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(),s,"0");
                                if(null !=mapss){
@@ -1272,17 +1274,10 @@
                }
            }
        }






        for (int i = 0; i < 1; i++) {
            paragraph = PdfUtils.setParagraph(defaultFont, "");
            document2.add(paragraph);
        }

        paragraph = PdfUtils.setParagraph(defaultTitleFont, "总检医生建议：");
        document2.add(paragraph);
        if (tjOrder.getCheckAdvice() == null) {

 ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java

@@ -489,7 +489,7 @@
    public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
        try {
            String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
            String[] split = useLisAndPacsRegisterDictTeam.split(",");
            String[] split = useLisAndPacsRegisterDictTeam.split(",|，|。|：|:");
            List<String> list = Arrays.asList(split);
            return list.contains(tjOrder.getTjType());
        } catch (Exception e) {

 ltkj-admin/src/test/java/zjhTest.java

@@ -125,9 +125,13 @@


        public static void main(String[] args) {
            BigDecimal ordPrice =new BigDecimal("13.05");
            BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
            System.out.println(multiply);
//            BigDecimal ordPrice =new BigDecimal("13.05");
//            BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
//            System.out.println(multiply);

            String a="抗甲状腺球蛋白抗体（TGAb）检测,1111，2222。33333：555555:666666";
            String[] split = a.split(",|，|。|：|:");
            System.out.println(split);
        }