From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
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 2cf5839..d9ab519 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
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TbTransition;
+import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 杩囨浮Service鎺ュ彛
@@ -74,6 +76,8 @@
//鏍规嵁韬唤璇佸彿鏌ヨ
public List<TbTransition> getTbTransitionListByCusId(String cusId,String cardId);
+ public List<TbTransition> getBlTbTransitionListByCusId(String cusId,String cardId,String jxbz);
+
//鏍规嵁韬唤璇佸彿鍜屽椁恑d涓嶇瓑浜庣┖鍒犻櫎
public boolean deletedTbTransitionListByCusIdAndPac(String cusId,String cardId);
@@ -106,13 +110,21 @@
public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount,String tjNum);
+ public boolean updateTbTransitionTjNumByCusId(String cusId,String tjNum);
+
+
+ public boolean updateTbTransitionById(String id,String jxbz,String tjNum,String cardId,BigDecimal jg);
+
+
void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId);
void saveRedisTransitionByProId(String cusId,String cardId, Long proId);
boolean saveTemoTransitionByGroupingId(String cusId,String groupingId);
- BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);
+ boolean ttsaveTemoTransitionByGroupingId(String cusId, String cardId,String groupingId);
+
+ BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,String proId);
BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
@@ -124,4 +136,24 @@
boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber);
void deleteTjOrderDetailByjxbz(String bldh);
+
+ String panduantaocanshifouchongfu(String idCard,Long pacId);
+
+ String ttpanduantaocanshifouchongfu(String idCard,Long pacId);
+
+ List<TbTransition> newgetTransitionList(String cusId);
+
+ TbTransition getOnwTbTransition(String idCard,String tjNumber);
+
+ List<Map<String,Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard);
+
+ void buxiangmuchajia(String idCard,String pacId,String proId,BigDecimal cj);
+
+
+ String getTbTransitionPacId(String cusId);
+
+
+ BigDecimal getTbTransitionNewPriceByTjNumAndParentId(String tjNum, String proId);
+
+ BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(String tjNum, String proId);
}
--
Gitblit v1.8.0