ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2616,9 +2616,10 @@ List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper); HashMap<String, Object> data = new HashMap<>(); for (LtkjHysqd hysqd : list) { LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>(); ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh()); List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper); // LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>(); // ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh()); // List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper); List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh()); if(null !=hybgds && !hybgds.isEmpty()){ // hybgds = hybgds.stream().distinct().collect(Collectors.toList()); hybgds = new ArrayList<>(hybgds.stream() ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -33,4 +33,7 @@ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh") List<String> getJianChaBaoGaoDan(String cardId); @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh} GROUP BY jcxmid HAVING MAX(shsj) ") List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
@@ -20,4 +20,6 @@ List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh); List<String> getJianChaBaoGaoDan(String cardId); List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
@@ -42,4 +42,9 @@ public List<String> getJianChaBaoGaoDan(String cardId) { return mapper.getJianChaBaoGaoDan(cardId); } @Override public List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh) { return mapper.getReportJianYanBaoGaoDanList(tmh); } }
