From 7a4ef2968a0d5d28b2fedaaaec2227557fc9d420 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 20 六月 2024 16:28:08 +0800
Subject: [PATCH] zjh 本地 2024/06/20 --2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 8 +++++---
ltkj-admin/src/main/java/com/ltkj/web/config/redis/OrderDelayService.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 8 ++++----
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/redis/OrderDelayService.java b/ltkj-admin/src/main/java/com/ltkj/web/config/redis/OrderDelayService.java
index 0572f1c..ee281d8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/redis/OrderDelayService.java
+++ b/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());
}
}
//璁㈠崟鍏抽棴涔嬪悗锛屽皢璁㈠崟寤舵椂浠诲姟浠庨槦鍒椾腑鍒犻櫎
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index bb4c122..355843d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/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("鎿嶄綔鎴愬姛");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 650b676..e911655 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/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());
}
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 80f92b9..1ceab0f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index 15438d8..f0fa86c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/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 @@
//鏍规嵁韬唤璇佸彿鍜屽椁恑d涓嶇瓑浜庣┖鍒犻櫎
public boolean deletedTbTransitionListByCusIdAndPac(String cusId,String cardId);
+
//鏍规嵁韬唤璇佸彿鍒犻櫎浣撴鍙风瓑浜庣┖鐨�
public boolean deletedTbTransitionListByCusIdAndTjNum(String cusId,String cardId);
+ //鏍规嵁韬唤璇佸彿鍒犻櫎
+ public boolean deletedTbTransitionByCusId(String cusId);
+
+ public boolean deletedTbTransitionByTjNum(String tjNum);
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ鍜岄」鐩甶d
public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(String cusId,String proId);
--
Gitblit v1.8.0