zjh20250115

zjh

2025-01-15 15bffae49de7532f456eb5a5f33dc16217b86771

zjh20250115

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

@@ -1190,7 +1190,18 @@
                        }
                        String str = "     ";
                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
                        for (Map<String, Object> objectMap : maps) {
                        if(detail.getDeptId().equals("2")){
                            String[] split = result.split("。");
                            for (String s : split) {
                                Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
                                Object bt = mapss.get("bt");
                                Object nr = mapss.get("nr");
                                if(null !=bt && null !=nr) maps.add(mapss);
                            }
                        }
                        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 = "     本报告仅对本次检查负责，临床医生依据病情如有疑问，请及时复查或进一步检查";
                            if (StrUtil.isBlank(content)) content = "     ";

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

@@ -1668,7 +1668,9 @@
                                    for (String s : split) {
                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        if(null !=maps && !maps.isEmpty()){
                                            mapList.add(maps);
                                            Object bt = maps.get("bt");
                                            Object nr = maps.get("nr");
                                            if(null !=bt && null !=nr) mapList.add(maps);
                                        }
                                    }
                                    tjOrderDetail.setAdvices(mapList);