zjh 2023/09/13---2

zjh

2023-09-13 8621fd09be0d89653391f2570d0878e4b3a9f0b5

zjh 2023/09/13---2

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

@@ -254,122 +254,6 @@
        return AjaxResult.error();
    }

   /* private void extracted(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer) {
        List<TjConsumables> list2 = new ArrayList<>();
        String[] tjProIds = tjFlowingWater.getTjProIds();
        for (String tjProId : tjProIds) {
            LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjProject::getProParentId, tjProId);
            List<Long> proIds = projectService.list(wq0).stream().map(TjProject::getProId).collect(Collectors.toList());
            TjOrderDetail detail = new TjOrderDetail();
            detail.setTjStatus(0L);
            detail.setOrderId(tjFlowingWater.getOrderId());
            detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
            detail.setProId(Long.valueOf(tjProId));
            detail.setIsAddition("Y");
            detailService.save(detail);
            for (Long proId : proIds) {
                TjOrderDetail detail1 = new TjOrderDetail();
                detail1.setTjStatus(0L);
                detail1.setOrderId(tjFlowingWater.getOrderId());
                detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
                detail1.setProId(proId);
                detail1.setIsAddition("Y");
                detailService.save(detail1);
            }
            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
            wqq.in(TbTransition::getProId, proIds);
            List<TbTransition> tbTransitionList = transitionService.list(wqq);
            if (null != tbTransitionList && tbTransitionList.size() > 0) {
                for (TbTransition transition : tbTransitionList) {
                    TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
                    //子项
                    if (null != tjProject) {
                        TjChargingStandard tjChargingStandard = new TjChargingStandard();
                        tjChargingStandard.setTjNum(order.getTjNumber());
                        tjChargingStandard.setProId(transition.getProId());
                        tjChargingStandard.setPrice(transition.getNowPrice());
                        tjChargingStandard.setProName(tjProject.getProName());
                        chargingStandardService.save(tjChargingStandard);
                    }
                }
                //父项
                TjProject parentProject = projectService.getById(tjProId);
                if (null != parentProject) {
                    LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
                    wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
                    List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
                    if (null != proConsumables && proConsumables.size() > 0) {
                        for (TjProConsumables tjProConsumables : proConsumables) {
                            TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
                            list2.add(tjConsumables);
                        }
                    }
                }
            }
        }
        //父项耗材
        ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
        for (TjConsumables tjConsumables : collect) {
            TjChargingStandard tjChargingStandard = new TjChargingStandard();
            tjChargingStandard.setTjNum(order.getTjNumber());
            tjChargingStandard.setConsumablesId(tjConsumables.getId());
            tjChargingStandard.setPrice(tjConsumables.getPrice());
            tjChargingStandard.setProName(tjConsumables.getMakings());
            tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
            tjChargingStandard.setCompany(tjConsumables.getSpecifications());
            chargingStandardService.save(tjChargingStandard);
        }
    }*/

    //备用添加收费明细
    /*private void extracted(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList) {
        for (TbTransition transition : tbTransitionList) {
            TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
            //子项
            if (null != tjProject) {
                TjChargingStandard tjChargingStandard = new TjChargingStandard();
                tjChargingStandard.setTjNum(order.getTjNumber());
                tjChargingStandard.setProId(transition.getProId());
                tjChargingStandard.setPrice(transition.getNowPrice());
                tjChargingStandard.setProName(tjProject.getProName());
                chargingStandardService.save(tjChargingStandard);
            }
        }

        //父项
        ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
        List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
        if (parentProIds.size() > 0) {
            for (Long parentProId : parentProIds) {
                TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
                if (null != parentProject) {
                    LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
                    wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
                    List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
                    if (null != proConsumables && proConsumables.size() > 0) {
                        for (TjProConsumables tjProConsumables : proConsumables) {
                            TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
                            list2.add(tjConsumables);
                        }
                    }
                }
            }
        }

        ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
        for (TjConsumables tjConsumables : collect) {
            TjChargingStandard tjChargingStandard = new TjChargingStandard();
            tjChargingStandard.setTjNum(order.getTjNumber());
            tjChargingStandard.setConsumablesId(tjConsumables.getId());
            tjChargingStandard.setPrice(tjConsumables.getPrice());
            tjChargingStandard.setProName(tjConsumables.getMakings());
            tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
            tjChargingStandard.setCompany(tjConsumables.getSpecifications());
            chargingStandardService.save(tjChargingStandard);
        }
    }*/

    /**
     * 删除体检流水

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

@@ -1537,8 +1537,10 @@

    @PostMapping("/deletedTbTransitionByCusId")
    @ApiOperation(value = "根据身份证号删除临时表数据")
    public AjaxResult deletedTbTransitionByCusId(@RequestBody String cusId) {
        transitionService.deletedTbTransitionByCusId(cusId);
        return AjaxResult.success();
    public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "身份证号") String cusId) {
        LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
        wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date());
        wq.eq(TbTransition::getCusId,cusId);
        return AjaxResult.success(transitionService.remove(wq));
    }
}

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

@@ -410,6 +410,10 @@
            delayService.reservation(tjReservation.getId());
            return AjaxResult.success("预约成功!!!");
        }
        LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>();
        remove.between(TbTransition::getCreateTime,DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()),-1),new Date());
        remove.eq(TbTransition::getCusId,tjReservation.getIdCard());
        transitionService.remove(remove);
        return AjaxResult.error("预约失败");
    }


 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java

@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Select;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -89,4 +90,7 @@

    @Select("SELECT SUM(a.now_price) now_price FROM tb_transition a WHERE cus_id=#{cusId}")
    BigDecimal sumNowPrice(String cusId);

    @Select("SELECT MAX(a.create_time) FROM tb_transition a WHERE a.cus_id=#{cusId} ")
    Date getTbTransitionCreateTimeByCusId(String cusId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java

@@ -5,6 +5,7 @@
import com.ltkj.hosp.domain.TbTransition;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -84,4 +85,8 @@
    public String getTbTransitionPacIdByCusIdAndPac(String cusId);

    BigDecimal sumNowPrice(String cusId);


    //根据身份证号获取最大时间
    public Date getTbTransitionCreateTimeByCusId(String cusId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java

@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;


@@ -124,4 +125,9 @@
    public BigDecimal sumNowPrice(String cusId) {
        return tbTransitionMapper.sumNowPrice(cusId);
    }

    @Override
    public Date getTbTransitionCreateTimeByCusId(String cusId) {
        return tbTransitionMapper.getTbTransitionCreateTimeByCusId(cusId);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java

@@ -702,6 +702,8 @@
        }
        redisCache.setCacheMapValue("cScheck", "ys",customerList);
    }


    @Override
    @Async("async")
    public void tjRefund(List<TjProject> refundPros, String tjNum) {
@@ -1103,7 +1105,7 @@
                        customer.setTjStatus(1L);
                        LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
                        wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
                        wq.in(TjOrderRemark::getType, 0,2,3);
                        wq.in(TjOrderRemark::getType, 0,3);
                        List<TjOrderRemark> list = orderRemarkService.list(wq);
                        if (null != list && list.size() > 0) {
                            StringBuilder stringBuilder = new StringBuilder();