zjh
昨天 99d28bddd6ad5bd7c87babf7dcab670215993cb6
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -103,7 +103,8 @@
            allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId());
        }
        lisSaveSqdxxDto.setFyje(allPrice.toString());
        lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode());
//        lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode());
        lisSaveSqdxxDto.setYbbm(sampling.getYb());
        if (sampling.getIsMerge() == 1){
            LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
@@ -257,15 +258,19 @@
            BigDecimal allPrice = tbTransitionMapper.getLisPriceByTjNumAndInProId(tjOrder.getTjNumber(), entry.getValue().stream().map(TjProject::getProId).collect(Collectors.toList()));
            lisSaveSqdxxDto.setFyje(allPrice.toString());
            lisSaveSqdxxDto.setYbbm(entry.getKey());
//            lisSaveSqdxxDto.setYbbm(entry.getKey());
            String s = entry.getKey();
            lisSaveSqdxxDto.setYbbm(s.substring(s.indexOf("_") + 1));
            String hisBms ="";
            for (TjProject tjProject : entry.getValue()) {
                LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                dto.setJyxm(tjProject.getLisXmbm());
                dto.setXmmc(tjProject.getProName());
                dtos.add(dto);
                hisBms+=tjProject.getHisXmbm()+",";
            }
@@ -280,6 +285,19 @@
                log.error("请求失败 ->{}", lisSaveSqdxxDto);
                flag = false;
                break;
            }else {
                LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                tree.setCardId(tjOrder.getCardId());
                tree.setPationid(tjCustomer.getPationId());
                tree.setSqdh("jk"+jyxh);
                tree.setFyhj(String.valueOf(allPrice));
                tree.setHisXmdm(hisBms.substring(0,hisBms.length()-1));
                tree.setType("检验");
                tree.setService("lis");
                tree.setTjPrice(String.valueOf(allPrice));
                tree.setCreateTime(DateUtil.date());
                tree.setXmfl(lisSaveSqdxxDto.getYbbm());
                ltkjJianchajianyanTreeService.save(tree);
            }
        }
        return flag;