zjh 本地 2024/06/20 --2

zjh

2024-06-20 7a4ef2968a0d5d28b2fedaaaec2227557fc9d420

zjh 本地 2024/06/20 --2

 ltkj-admin/src/main/java/com/ltkj/web/config/redis/OrderDelayService.java

@@ -110,7 +110,7 @@
              mallTimeConfigService.updateById(one);
              byId.setIsExpire(1);
              reservationService.updateById(byId);
              transitionService.deletedTbTransitionByCusId(byId.getIdCard());
              transitionService.deletedTbTransitionListByCusIdAndTjNum(byId.getIdCard(),byId.getCardId());
            }
          }
          //订单关闭之后，将订单延时任务从队列中删除

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

@@ -619,10 +619,10 @@
                    if (null != customer) {
                        customer.setCusNumber(customer.getCusNumber() + 1);
                        if (customerService.updateById(customer)) {
                            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
                            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
                            wqq.eq(TbTransition::getCardId, customer.getCardId());
                            transitionService.remove(wqq);
//                            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/TjReportController.java

@@ -1344,7 +1344,7 @@
                    e.printStackTrace();
                    return AjaxResult.success("PDF导出失败");
                } finally {
                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
//                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
                }
            }
        }

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

@@ -23,6 +23,6 @@
    void  deletedLtkjHybgdByTjhAndTmh(String tmh);


    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检验'")
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检验' GROUP BY a.sqdh")
    String  getJianYanBaoGaoDan(String cardId);
}

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

@@ -63,10 +63,7 @@
     */
    public int deleteTbTransitionById(String id);

    //根据身份证号删除
    public boolean deletedTbTransitionByCusId(String cusId);

    public boolean deletedTbTransitionByTjNum(String tjNum);

    public boolean updateTbTransitionByTjNum(String tjNum);

@@ -79,9 +76,14 @@

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

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

    //根据身份证号删除
    public boolean deletedTbTransitionByCusId(String cusId);

    public boolean deletedTbTransitionByTjNum(String tjNum);

    //根据身份证号和套餐id查询和项目id
    public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(String cusId,String proId);