From f42cce5f1b56371413f50676576b0ca195bec6b6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 02 二月 2024 20:06:35 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 56c4b2d..e2a3f10 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -542,7 +542,7 @@
} else {
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber());
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
@@ -634,7 +634,7 @@
wq.ne(TjOrderDetail::getTjStatus, 3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber());
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(),tjOrder.getCardId());
if (null != detailList && detailList.size() > 0) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
for (TjOrderDetail detail : detailList) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index f244d9a..499bf68 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -209,6 +209,6 @@
"WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId}) ")
BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
- @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}")
- String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum);
+ @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId}")
+ String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")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 7c22ed0..871ad1e 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
@@ -107,5 +107,5 @@
BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
- String selectPacIdByTbTransitionTjNumAndProId(String tjNum);
+ String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 0be7365..be88f8a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -168,7 +168,7 @@
}
@Override
- public String selectPacIdByTbTransitionTjNumAndProId(String tjNum) {
- return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum);
+ public String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId) {
+ return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,cardId);
}
}
--
Gitblit v1.8.0