zjh 本地 2023/12/23 -1

zjh

2023-12-23 ddcd1e3b0a6c4a426b81cdae021e7bb3be910534

zjh 本地 2023/12/23 -1

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

@@ -494,6 +494,7 @@
                        if (customerService.updateById(customer)) {
                            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
                            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
                            wqq.eq(TbTransition::getCardId,customer.getCardId());
                            transitionService.remove(wqq);
                            asyncService.updateCheckType(tjNumber);
                            return AjaxResult.success("操作成功");

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

@@ -86,44 +86,52 @@
        if (!"".equals(cusIdcard) && cusIdcard != null) {
            //判断身份证号格式是否正确
            // TODO: 2023/2/10  判断身份证号格式是否正确
            if(cusIdcard.length()==18){
                if (! MatchUtils.isIdCard(cusIdcard)) {
                    return AjaxResult.error("身份证号码错误");
                }
            }
            if(cusIdcard.length()==9){
                if (!MatchUtils.cardValidates(cusIdcard)) {
                    return AjaxResult.error("身份证号码错误");
                }
            }
//            if(cusIdcard.length()==18){
//                if (! MatchUtils.isIdCard(cusIdcard)) {
//                    return AjaxResult.error("身份证号码错误");
//                }
//            }
//            if(cusIdcard.length()==9){
//                if (!MatchUtils.cardValidates(cusIdcard)) {
//                    return AjaxResult.error("身份证号码错误");
//                }
//            }
            //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
            final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
            if ("Y".equals(getInfoFromSqlData)){
                //根据身份证好查信息
                 LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                //根据身份证号从his查信息
                LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                if(null != tjPatByIdCard){
                    String fcardNo = tjPatByIdCard.getFcardNo();
                    if(null !=fcardNo){
                        fcardNo=fcardNo.trim();
                        tjPatByIdCard.setFcardNo(fcardNo);
                    }
                    //根据身份证号从数据库拿信息 没有的话保存
                    LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard);
                    if(null==ltkjTjPat){
                        tjvLtkjvtjpatService.save(tjPatByIdCard);
                    }
                    DynamicDataSourceContextHolder.clearDataSourceType();
                    //再根据身份证号写customer表
                    TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
                    TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(tjPatByIdCard.getFcardNo());
                    if(null == tjCustomer){
                        //为空的话掉存储过程保存到客户表
                        testMapper.getTjPatByCusId(cusIdcard);
                        LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
                        qw.eq(TjCustomer::getCusIdcard, cusIdcard);
                        qw.eq(TjCustomer::getCusIdcard, tjPatByIdCard.getFcardNo());
                        TjCustomer customer = tjCustomerService.getOne(qw);
                        customer.setReservationId(customer.getCardId());
                        extracted(customer);
                        return success(customer);
                    }else {
                        String cardId = tjCustomer.getCardId();
                        if(null !=cardId && cardId.equals(tjPatByIdCard.getFcardId())){
                            return AjaxResult.error("不可重复签到");
                        }
                        tjCustomer.setReservationId(tjCustomer.getCardId());
                        tjCustomer.setCardId(tjPatByIdCard.getFcardId());
                        tjCustomerService.updateById(tjCustomer);
                        extracted(tjCustomer);
                        return success(tjCustomer);
                    }
@@ -169,7 +177,6 @@
                    tjCustomer1.setReservationId(tjReservation.getId());
                    tjCustomer1.setDiscount(tjReservation.getDiscount());
                    tjCustomer1.setGroupingId(tjReservation.getGroupingId());

                    return success(tjCustomer1);
                }
                TjCustomer tjCustomer = new TjCustomer();
@@ -213,6 +220,7 @@
    }

    private void extracted(TjCustomer customer) {
        //从his表抓数据
        LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
        if (null != pat) {
            List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
@@ -223,7 +231,6 @@
                for (LtkjMiddleDetail ltkjMiddleDetail : list) {
                    middleDetailService.save(ltkjMiddleDetail);
                }
                testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
            }
            testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
        }

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

@@ -796,22 +796,28 @@
     */
    @PostMapping
    @ApiOperation(value = "体检签到登记接口")
    //@Transactional  (切换数据库出错，所以注释)
    @Transactional  //(切换数据库出错，所以注释)
    public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
        Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
        SysUser sysUser = userService.getById(userId);

        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
        wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
        TjCustomer tjCustomer = tjCustomerService.getOne(wq);
        if (tjCustomer == null) return AjaxResult.error("该客户未登记或不存在");

        LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
        wqq.eq(TjOrder::getCheckStatus, 0);
        wqq.isNull(TjOrder::getFinishTime);
        if(!tjCustomer.getCardId().equals("0")){
            wqq.eq(TjOrder::getCardId,tjCustomer.getCardId());
        }
        TjOrder order = tjOrderService.getOne(wqq);
        if (null != order) {
            transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
            return AjaxResult.error("不可重复登记");
        }
        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
        wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
        TjCustomer tjCustomer = tjCustomerService.getOne(wq);
        if (tjCustomer == null) return AjaxResult.error("该客户未签到或不存在");
        LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
        wq1.eq(TjReservation::getIsExpire, 2);
@@ -869,6 +875,7 @@
        //判断小程序上预约是否付钱
        if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
        tjOrder.setStatus(TjConstants.TJ_BEGIN);
        tjOrder.setCardId(tjCustomer.getCardId());
        if (tjOrderService.save(tjOrder)) {
            //保存收货地址
            if ("2".equals(tjOrder.getGetType())){
@@ -881,9 +888,9 @@
            Long cusNumber = tjCustomer.getCusNumber();
            cusNumber += 1;
            tjCustomer.setCusNumber(cusNumber);
            tjCustomerService.updateById(tjCustomer);
            BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
            TjFlowingWater tjFlowingWater = new TjFlowingWater();
            tjFlowingWater.setPayStasus(0L);
            if ("1".equals(tjOrder.getTjType())) {
                if (null != tjReservation && tjReservation.getPayType() == 1) {
                    tjFlowingWater.setPayStasus(3L);
@@ -893,67 +900,44 @@
            //调用SQL server拿取收费情况
            //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
            final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
            final String isPay = configService.selectConfigByKey("isPay");
            if ("Y".equals(getInfoFromSqlData)){

                //查询是否his已收费  若收费则将流水表收费状态改成已收费
//                LambdaQueryWrapper<LtkjMiddleHead> middleHeadLambdaQueryWrapper =new LambdaQueryWrapper<>();
//                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getPatId,tjCustomer.getCusIdcard());
//                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsCanceled,"N");
//                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsChg,"Y");
//                LtkjMiddleHead middleHead = headService.getOne(middleHeadLambdaQueryWrapper);
                LtkjMiddleHead middleHead = testMapper.getMiddleHeadByPartId(tjCustomer.getCardId());
                LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
                if(null !=middleHead){
                    tjFlowingWater.setPayStasus(1L);
                }
//                List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
//                if (one!=null){
//                    for (LtkjMiddleHead ltkjMiddleHead : one) {
//                        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
//                        headService.save(ltkjMiddleHead);
//                        DynamicDataSourceContextHolder.clearDataSourceType();
//                        List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
//                        if (detailList!=null){
//                            for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
//                                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
//                                middleDetailService.save(ltkjMiddleDetail);
//                                DynamicDataSourceContextHolder.clearDataSourceType();
//                            }
//                        }
//                    }
//
//                }
            }


            tjFlowingWater.setOrderId(tjOrder.getOrderId());
            Date date1 = new Date(System.currentTimeMillis());
            String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
            if (null != mallOrder) {
                if (mallOrder.getOrderStatus().equals(201L)) {
                    tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
                    tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
                    tjFlowingWater.setDiscount(String.valueOf(1));
                    tjFlowingWater.setPayStasus(1L);
                    tjFlowingWater.setPayType(3L);
                    MallCheckLog checkLog = new MallCheckLog();
                    checkLog.setCheckBy(sysUser.getNickName());
                    checkLog.setUserId(mallOrder.getUserId());
                    checkLog.setConsignee(mallOrder.getConsignee());
                    checkLog.setIdCard(mallOrder.getIdCard());
                    checkLog.setOrderId(String.valueOf(mallOrder.getId()));
                    checkLog.setOrderSn(mallOrder.getOrderSn());
                    checkLog.setCheckTime(new Date());
                    checkLog.setShipSn("HX" + s1);
                    mallCheckLogService.save(checkLog);
                    mallOrder.setOrderStatus(301L);
                    mallOrderService.updateById(mallOrder);
            if(isPay.equals("true")){
                if (null != mallOrder) {
                    if (mallOrder.getOrderStatus().equals(201L)) {
                        tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
                        tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
                        tjFlowingWater.setDiscount(String.valueOf(1));
                        tjFlowingWater.setPayStasus(1L);
                        tjFlowingWater.setPayType(3L);
                        MallCheckLog checkLog = new MallCheckLog();
                        checkLog.setCheckBy(sysUser.getNickName());
                        checkLog.setUserId(mallOrder.getUserId());
                        checkLog.setConsignee(mallOrder.getConsignee());
                        checkLog.setIdCard(mallOrder.getIdCard());
                        checkLog.setOrderId(String.valueOf(mallOrder.getId()));
                        checkLog.setOrderSn(mallOrder.getOrderSn());
                        checkLog.setCheckTime(new Date());
                        checkLog.setShipSn("HX" + s1);
                        mallCheckLogService.save(checkLog);
                        mallOrder.setOrderStatus(301L);
                        mallOrderService.updateById(mallOrder);
                    }
                } else {
                    tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
                    tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
                    tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
//                    tjFlowingWater.setPayStasus(0L);
                }
            } else {
                tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
                tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
                tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
                tjFlowingWater.setPayStasus(0L);
            }
            if (tjFlowingWaterService.save(tjFlowingWater)) {
                tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
@@ -969,7 +953,7 @@
            //个人
            if ("2".equals(tjOrder.getTjType())) {

//                asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
            }

@@ -995,7 +979,8 @@
//
//                }
//            }

            tjCustomer.setCardId("0");
            tjCustomerService.updateById(tjCustomer);
            return AjaxResult.success(tjNumber);
        }
        return AjaxResult.error();
@@ -1058,28 +1043,33 @@
        if (null != proIds1 && !proIds1.equals("")) {
            proIds = JSON.parseArray(proIds1.toString(), Long.class);
        }
        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
        String cardId ="0";
        if(null !=tjCustomer){
             cardId = tjCustomer.getCardId();
        }
        if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
            transitionService.deletedTbTransitionByCusId(cusId);
            if (redisCache.hasKey(cusId)) redisCache.deleteObject(cusId);
            if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
            if (redisCache.hasKey(cardId+cusId + "cusId")) redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);

        }
        List<TbTransition> tbTransitionList = null;
        if (!redisCache.hasKey(cusId)) {
        if (!redisCache.hasKey(cardId+cusId)) {
            tbTransitionList = new ArrayList<>();
        } else {
            tbTransitionList = redisCache.getCacheList(cusId);
            tbTransitionList = redisCache.getCacheList(cardId+cusId);
        }
        //套餐
        if (null != packId && !packId.equals("")) {
            Long pacId = Long.valueOf(packId.toString());
            List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
            if (null == list || list.size() == 0) {
                transitionService.deletedTbTransitionListByCusIdAndPac(cusId);
                if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
                if (redisCache.hasKey(cusId)) {
                transitionService.deletedTbTransitionListByCusIdAndPac(cusId,cardId);
                if (redisCache.hasKey(cardId+cusId + "cusId")) redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);
                if (redisCache.hasKey(cardId+cusId)) {
                    tbTransitionList = new ArrayList<>();
                    redisCache.deleteObject(cusId);
                    redisCache.deleteObject(cardId+cusId);
                }
                List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                if (null != ppList && ppList.size() > 0) {
@@ -1169,13 +1159,13 @@
            }
        }
        if (null != tbTransitionList && tbTransitionList.size() > 0) {
            if (redisCache.hasKey(cusId)) {
                redisCache.deleteObject(cusId);
                redisCache.setCacheList(cusId, tbTransitionList);
                redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
            if (redisCache.hasKey(cardId+cusId)) {
                redisCache.deleteObject(cardId+cusId);
                redisCache.setCacheList(cardId+cusId, tbTransitionList);
                redisCache.setCacheMapValue(cardId+cusId + "cusId", cardId+cusId, getMaps(cusId,cardId));
            } else {
                redisCache.setCacheList(cusId, tbTransitionList);
                redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
                redisCache.setCacheList(cardId+cusId, tbTransitionList);
                redisCache.setCacheMapValue(cardId+cusId + "cusId", cardId+cusId, getMaps(cusId,cardId));
            }
        }
        return AjaxResult.success();
@@ -1189,7 +1179,12 @@
            List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
            return AjaxResult.success(list);
        }
        List<Map<String, Object>> list = getMaps(cusId);
        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
        String cardId ="0";
        if(null !=tjCustomer){
            cardId = tjCustomer.getCardId();
        }
        List<Map<String, Object>> list = getMaps(cusId,cardId);
        return AjaxResult.success(list);
    }

@@ -1426,13 +1421,13 @@
    }


    private List<Map<String, Object>> getMaps(String cusId) {
    private List<Map<String, Object>> getMaps(String cusId,String cardId) {

        List<TbTransition> transitionList = null;
        if (redisCache.hasKey(cusId)) {
            transitionList = redisCache.getCacheList(cusId);
        if (redisCache.hasKey(cardId+cusId)) {
            transitionList = redisCache.getCacheList(cardId+cusId);
        } else {
            transitionList = transitionService.getTbTransitionListByCusId(cusId);
            transitionList = transitionService.getTbTransitionListByCusId(cusId,cardId);
        }
        if (null == transitionList) return null;
        Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
@@ -1689,11 +1684,10 @@
    }

    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
        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()));
        //修改每项的原价现价
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount);
        //修改每项的原价现价 //修改临时表体检号
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount,tjOrder.getTjNumber());
        //添加remark表数据
        remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
        //判断是否交钱
@@ -1703,7 +1697,7 @@
                        sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
            }
        }
        if (tjFlowingWater.getPayStasus() == 1) {
        if (tjFlowingWater.getPayStasus() == 1L) {
            tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                    sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
        }

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

@@ -90,7 +90,8 @@

    @Autowired
    private ISysDictDataService dictDataService;

    @Resource
    private ITbTransitionService transitionService;

    //    /* *//**
//     * 查询体检报告存储列表
@@ -270,6 +271,7 @@

        if (null != tjOrder) {
            LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
            TjReportTemplate reportTemplate =null;
            if (tjOrder.getTjCategory()!=null){
                //查询字典
                LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
@@ -290,12 +292,13 @@
                }else {
                    tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
                }
                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
                reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
            }else {
                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
                reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
            }


            tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
            TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
            String template = one1.getTemplate();
            String template = reportTemplate.getTemplate();

            String userId = SecurityUtils.getLoginUser().getUsername();
            PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "体检报告封面模板.pdf");
@@ -649,6 +652,8 @@
                } catch (Exception e) {
                    e.printStackTrace();
                    return AjaxResult.success("PDF导出失败");
                }finally {
                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjOrder.getCardId());
                }
            }
        }

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java

@@ -73,6 +73,12 @@
    @ApiModelProperty(value = "项目类型 (改为性别 男女全部)")
    private String proType;

    @ApiModelProperty(value = "体检号")
    private String tjNum;

    @ApiModelProperty(value = "体检唯一号")
    private String cardId;

    @ApiModelProperty("唯一标识")
    @TableField(exist = false)
    private String onlyId;

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java

@@ -430,7 +430,8 @@
     */
    @ApiModelProperty("体检类别")
    private String tjCategory;

    @ApiModelProperty("就诊编号")
    private String cardId;

    @Override
    public String toString() {

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

@@ -72,11 +72,14 @@
    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
    public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);

    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}")
    public List<TbTransition> getTbTransitionListByCusId(String cusId);
    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId}")
    public List<TbTransition> getTbTransitionListByCusId(@Param("cusId")String cusId,@Param("cardId")String cardId);

    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId);
    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and card_id=#{cardId}")
    public boolean deletedTbTransitionListByCusIdAndPac(@Param("cusId")String cusId,@Param("cardId")String cardId);

    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(tj_num)and card_id=#{cardId}")
    public boolean deletedTbTransitionListByCusIdAndTjNum(@Param("cusId")String cusId,@Param("cardId")String cardId);

    //根据身份证号和套餐id查询和项目id
//    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id)  AND pro_id =#{proId}")
@@ -97,9 +100,10 @@

    @Update("UPDATE tb_transition a SET \n" +
            "a.ord_price=a.now_price,\n" +
            "a.now_price=a.ord_price*#{discount}" +
            "a.now_price=a.ord_price*#{discount}," +
            "a.tj_num=#{tjNum}"+
            " WHERE a.cus_id=#{cusId} ")
    boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount);
    boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum);


    @Insert("INSERT INTO tb_transition(\n" +

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

@@ -44,7 +44,7 @@
    public List<LtkjTjPat> getTjPat();

    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select({"<script> select fcard_iD xh,fcard_no pacCode,pat_name pacName,\n" +
    @Select({"<script> select isnull(fcard_no,'不详') xh,fcard_iD pacCode,pat_name pacName,\n" +
            " (case when patsex_id='0' then '男' when patsex_id='1' then '女' else '未知' end )+';'+brnl detail,\n" +
            " pat_id price , mobile pacRemark" +
            "  from histjv_ltkjvtjpat where 1=1 "+
@@ -52,7 +52,7 @@
            "  AND fcard_no = #{pacCode}" +
            "</when>" +
            " <when test='pacName!=null'>" +
            "  AND pat_name = #{pacName}" +
            "  AND pat_name = #(pacName}" +
            "</when>" +
            " <when test='pacRemark!=null'>" +
            "  AND mobile = #{pacRemark}" +

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

@@ -17,6 +17,6 @@
@DataSource(value = DataSourceType.MASTER)
public interface TjvLtkjvtjpatMapper extends BaseMapper<LtkjTjPat> {

    @Select("SELECT * FROM ltkj_tj_pat where fcard_no = #{idCard} ")
    @Select("SELECT * FROM ltkj_tj_pat where fcard_no = #{idCard} or fcard_id=#{idCard} ")
    LtkjTjPat getLtkjTjPatByCusIdCard(String idCard);
}

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

@@ -71,10 +71,12 @@
    public List<TbTransition> getTbTransitionListByCusIdAndPac(String cusId,String pacId);

    //根据身份证号查询
    public List<TbTransition> getTbTransitionListByCusId(String cusId);
    public List<TbTransition> getTbTransitionListByCusId(String cusId,String cardId);

    //根据身份证号和套餐id不等于空删除
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId);
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId,String cardId);
    //根据身份证号删除体检号等于空的
    public boolean deletedTbTransitionListByCusIdAndTjNum(String cusId,String cardId);


    //根据身份证号和套餐id查询和项目id
@@ -92,7 +94,8 @@


    //根据身份证号修改临时表中的现价和原价
    public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount);
    public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount,String tjNum);


    void saveRedisTransitionByPacId(String cusId, Long pacId);


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

@@ -102,13 +102,18 @@
    }

    @Override
    public List<TbTransition> getTbTransitionListByCusId(String cusId) {
        return tbTransitionMapper.getTbTransitionListByCusId(cusId);
    public List<TbTransition> getTbTransitionListByCusId(String cusId,String cardId) {
        return tbTransitionMapper.getTbTransitionListByCusId(cusId,cardId);
    }

    @Override
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId) {
        return tbTransitionMapper.deletedTbTransitionListByCusIdAndPac(cusId);
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId,String cardId) {
        return tbTransitionMapper.deletedTbTransitionListByCusIdAndPac(cusId,cardId);
    }

    @Override
    public boolean deletedTbTransitionListByCusIdAndTjNum(String cusId,String cardId) {
        return tbTransitionMapper.deletedTbTransitionListByCusIdAndTjNum(cusId,cardId);
    }

    @Override
@@ -132,10 +137,11 @@
    }

    @Override
    public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount) {
        return tbTransitionMapper.updateTbTransitionPriceByCusId(cusId,discount);
    public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount,String tjNum) {
        return tbTransitionMapper.updateTbTransitionPriceByCusId(cusId,discount,tjNum);
    }


    @Override
    public void saveRedisTransitionByPacId(String cusId, Long pacId) {
        tbTransitionMapper.saveRedisTransitionByPacId(cusId,pacId);