zjh20250221

zjh

2025-02-21 753dc0c1fe983dbde92ffaa8cf5efc742a6949de

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

@@ -34,8 +34,10 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.PdfUtils;
import com.ltkj.web.controller.system.SysDeptController;
import jodd.util.StringUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import net.sf.ehcache.search.aggregator.Count;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -1013,11 +1015,9 @@
            for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
                List<TjOrderYcxm> details = entry.getValue();
                String xmmc = entry.getKey();
//                    String xmmc = details.get(0).getProName();
                boolean isXmWrite = false;
                int index = 1;
                for (TjOrderYcxm detail : details) {
//                        if (!entry.getKey().equals(detail.getProId())) continue;
                    if (!isXmWrite) {
                        paragraph = new Paragraph(xmXh + ".  " + xmmc, defaultFont);
                        paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1029,6 +1029,7 @@
                        result = result.replaceAll("本报告仅对本次检查负责，临床医生依据病情如有疑问，请及时复查或进一步检查", "");
                        StringBuilder builder = new StringBuilder();
                        if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;

                        builder.append("    (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
                        index++;

@@ -1476,9 +1477,11 @@
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                document2.add(paragraph);
                                String str = "    ";
                                List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "",
                                        i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[（(][^）)]*[）)]", "")
                                                .replaceAll("[ 测定检测]", ""), i.get(1));
                                List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), i.get(0).replaceAll("[（(][^）)]*[）)]", "")
                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                        i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), i.get(1));

                                if (!maps.isEmpty()) {
                                    for (Map<String, Object> objectMap : maps) {
                                        Object bt = objectMap.get("bt");
@@ -2591,6 +2594,13 @@
            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
            if(null !=hybgds && !hybgds.isEmpty()){
//                hybgds = hybgds.stream().distinct().collect(Collectors.toList());
                hybgds = new ArrayList<>(hybgds.stream()
                        .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
                        .values());



//                hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                hybgds = hybgds.stream()
//                        .sorted(Comparator.comparingInt(