ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2928,9 +2928,9 @@ List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh()); 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 = new ArrayList<>(hybgds.stream() // .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing)) // .values()); Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg)); @@ -2941,7 +2941,7 @@ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictData::getDictType,"qj_type"); wrapper.eq(SysDictData::getDictLabel,firstKey); List<SysDictData> dictList = sysDictDataService.list(); List<SysDictData> dictList = sysDictDataService.list(wrapper); if (!dictList.isEmpty()) { isGroupOnce = true; groupOnceProResult = firstKey; ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1413,9 +1413,12 @@ parent.put("", remark.getXmlb()); List<TjOrderDetail> dels = new ArrayList<>(); if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) { Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream() .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId())) .collect(Collectors.groupingBy(TjOrderDetail::getProResult)); // null !=dictList && boolean isGroupOnce = false; String groupOnceProResult = ""; if (listMap.size() == 1){ @@ -1423,8 +1426,8 @@ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictData::getDictType,"qj_type"); wrapper.eq(SysDictData::getDictLabel,firstKey); List<SysDictData> dictList = sysDictDataService.list(); if (!dictList.isEmpty()) { List<SysDictData> dictList = sysDictDataService.list(wrapper); if (!dictList.isEmpty()) { isGroupOnce = true; groupOnceProResult = firstKey; }
