报告合并判断心电图和附件

lige

2024-01-24 5e1c1a6cbdb2ea0d40e076a00f954490166f7ce8

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -838,6 +838,7 @@
            if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
            if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
            if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
            if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
            if (null != tjReservation.getGroupingId()){
                tjOrder.setGroupId(tjReservation.getGroupingId());
                tjOrder.setFirmDeptId(tjReservation.getPacId());
@@ -1443,30 +1444,21 @@
            }
            map.put("parentName", projectService.getById(entry.getKey()).getProName());
            map.put("list", entry.getValue());
            List<TbTransition> tbTransitionList = entry.getValue();
            if (null != tbTransitionList && tbTransitionList.size() > 0) {
                BigDecimal money1 = new BigDecimal("0.00");
                BigDecimal money2 = new BigDecimal("0.00");
                for (TbTransition tbTransition : tbTransitionList) {
                    money1 = money1.add(tbTransition.getOrdPrice());
                    money2 = money2.add(tbTransition.getNowPrice());
//                    if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
//                        tbTransition.setDiscount("0");
//                    } else {
//                        tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
//                    }
//                    if (null != tbTransition.getPacId()) {
//                        tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
//                    }
//                    if (null != tbTransition.getParentProId()) {
//                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
//                    }
                }
//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("ordPrice", money1);
                map.put("nowPrice", money2);
            }
//            List<TbTransition> tbTransitionList = entry.getValue();
//            if (null != tbTransitionList && tbTransitionList.size() > 0) {
//                BigDecimal money1 = new BigDecimal("0.00");
//                BigDecimal money2 = new BigDecimal("0.00");
//                for (TbTransition tbTransition : tbTransitionList) {
//                    money1 = money1.add(tbTransition.getOrdPrice());
//                    money2 = money2.add(tbTransition.getNowPrice());
//                }
//                map.put("ordPrice", money1);
//                map.put("nowPrice", money2);
//            }
            TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
                    .eq(TjPackageProject::getProId, entry.getKey()));
            map.put("ordPrice", project.getPriceNow());
            map.put("nowPrice", projectService.getById(entry.getKey()).getPriceNow());
            list.add(map);
        }
        return list;
@@ -1686,6 +1678,7 @@
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        //修改每项的原价现价 //修改临时表体检号
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount,tjOrder.getTjNumber());
        //添加remark表数据