zhaowenxuan
5 天以前 2703b3a022bea433419cfcf264099527a7cff63c
报告弃检重复问题
1个文件已修改
103 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1722,6 +1722,7 @@
        document.setMargins(70, 70, 40, 40);
        document.open();
        //
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
        notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
        try {
@@ -2931,6 +2932,20 @@
                        .values());
                Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg));
                boolean isGroupOnce = false;
                String groupOnceProResult = "";
                if (listMap.size()==1){
                    String firstKey = listMap.keySet().stream().findFirst().orElse(null);
                    LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(SysDictData::getDictType,"qj_type");
                    wrapper.eq(SysDictData::getDictLabel,firstKey);
                    List<SysDictData> dictList = sysDictDataService.list();
                    if (!dictList.isEmpty()) {
                        isGroupOnce = true;
                        groupOnceProResult = firstKey;
                    }
                }
//                hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                hybgds = hybgds.stream()
@@ -2939,6 +2954,7 @@
//                        ))
//                        .collect(Collectors.toList());
                if (!isGroupOnce){
                // 大类项目名称
                String xmmc = hysqd.getXmmc();
                ArrayList<List<String>> lists = new ArrayList<>();
@@ -3003,6 +3019,56 @@
                    lists.add(strings);
                }
                if (!lists.isEmpty()) {
                        HashMap<String, Object> map = new HashMap<>();
                        map.put("data", lists);
                        map.put("jyys", hashSet);
                        if (StrUtil.isNotBlank(shsj)) {
                            shsj = shsj.split(" ")[0];
                        }
                        map.put("shsj", shsj);
                        data.put(xmmc, map);
                    }
                }else {
                    String xmmc = hysqd.getXmmc();
                    ArrayList<List<String>> lists = new ArrayList<>();
                    HashSet<String> hashSet = new HashSet<>();
                    LtkjHybgd hybgd = hybgds.get(0);
                    String shsj = "";
                    shsj = hybgd.getShsj();
                    String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
                    String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
                    String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
                    String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
                    String ycbz = "";
                    if (StrUtil.isNotBlank(groupOnceProResult) && fwz != null && StrUtil.isNotBlank(fwz)) {
                        try {
                            String[] fwzs = fwz.split("-");
                            BigDecimal min = new BigDecimal(fwzs[0]);
                            BigDecimal max = new BigDecimal(fwzs[1]);
                            BigDecimal jyjgval = new BigDecimal(groupOnceProResult);
                            if (jyjgval.compareTo(min) < 0) {
                                ycbz = "↓";
                            } else if (jyjgval.compareTo(max) > 0) {
                                ycbz = "↑";
                            }
                        } catch (Exception ignored) {
                        }
                    }
                    String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
                    if (null != shys && null != shysmc && key.equals("Y")) {
                        hashSet.add(shysmc + "|" + shys);
                    } else {
                        if (null != shysmc) hashSet.add(shysmc);
                    }
                    ArrayList<String> strings = new ArrayList<>();
                    strings.add(xmmc);
                    strings.add(groupOnceProResult);
                    strings.add(ycbz);
                    strings.add(jgdw);
                    strings.add(fwz);
                    strings.add(hybgd.getJcxmid());
                    strings.add(hysqd.getXmid());
                    lists.add(strings);
                    HashMap<String, Object> map = new HashMap<>();
                    map.put("data", lists);
                    map.put("jyys", hashSet);
@@ -3202,6 +3268,25 @@
            tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
                    .collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
            boolean isGroupOnce = false;
            String groupOnceProResult = "";
            if (tjOrderDetails.size() > 1) {
                Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProResult));
                if (listMap.size() == 1){
                    String firstKey = listMap.keySet().stream().findFirst().orElse(null);
                    LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(SysDictData::getDictType,"qj_type");
                    wrapper.eq(SysDictData::getDictLabel,firstKey);
                    List<SysDictData> list = sysDictDataService.list();
                    if (!list.isEmpty()) {
                        isGroupOnce = true;
                        groupOnceProResult = firstKey;
                    }
                }
            }
            if (!isGroupOnce) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -3236,6 +3321,24 @@
                    }
                }
            }
            }else {
                TjOrderRemark orderRemark = entry.getKey();
                TjProject project = projectService.getById(orderRemark.getProId());
                if (null != project && project.getNeedReport().equals("Y") && orderRemark.getType() == 1) {
                    TjPdfVO tjPdfVO = new TjPdfVO();
                    tjPdfVO.setProName(project.getProName());
                    tjPdfVO.setProResult(groupOnceProResult);
                    tjPdfVO.setExc(0L);
                    tjPdfVO.setCompany("/");
                    tjPdfVO.setProId(String.valueOf(orderRemark.getProId()));
                    tjPdfVO.setPid(String.valueOf(orderRemark.getProId()));
                    tjPdfVO.setXh(1);
                    tjPdfVOS.add(tjPdfVO);
                }
            }
            if(!tjPdfVOS.isEmpty()){
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()