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/impl/TbTransitionServiceImpl.java |   86 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 1 deletions(-)

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 d483dc8..d25b607 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
@@ -9,8 +9,10 @@
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -102,6 +104,11 @@
     }
 
     @Override
+    public boolean delTbBycusCardIdAndProId(String cdId, String proId) {
+        return tbTransitionMapper.delTbBycusCardIdAndProId(cdId,proId);
+    }
+
+    @Override
     public boolean updateTbTransitionByTjNum(String tjNum) {
         return tbTransitionMapper.updateTbTransitionByTjNum(tjNum);
     }
@@ -114,6 +121,11 @@
     @Override
     public List<TbTransition> getTbTransitionListByCusId(String cusId,String cardId) {
         return tbTransitionMapper.getTbTransitionListByCusId(cusId,cardId);
+    }
+
+    @Override
+    public List<TbTransition> getBlTbTransitionListByCusId(String cusId, String cardId, String jxbz) {
+        return tbTransitionMapper.getBlTbTransitionListByCusId(cusId,cardId,jxbz);
     }
 
     @Override
@@ -151,6 +163,16 @@
         return tbTransitionMapper.updateTbTransitionPriceByCusId(cusId,discount,tjNum);
     }
 
+    @Override
+    public boolean updateTbTransitionTjNumByCusId(String cusId, String tjNum) {
+        return tbTransitionMapper.updateTbTransitionTjNumByCusId(cusId,tjNum);
+    }
+
+    @Override
+    public boolean updateTbTransitionById(String id,String jxbz,String tjNum,String cardId,BigDecimal jg) {
+        return tbTransitionMapper.updateTbTransitionById(id,jxbz,tjNum,cardId,jg);
+    }
+
 
     @Override
     public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId) {
@@ -168,7 +190,12 @@
     }
 
     @Override
-    public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) {
+    public boolean ttsaveTemoTransitionByGroupingId(String cusId, String cardId, String groupingId) {
+        return tbTransitionMapper.ttsaveTemoTransitionByGroupingId(cusId,cardId,groupingId);
+    }
+
+    @Override
+    public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, String proId) {
         return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId);
     }
 
@@ -186,4 +213,61 @@
     public String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId) {
         return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,cardId);
     }
+
+    @Override
+    public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId,String tjNumber) {
+        return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId,tjNumber);
+    }
+
+    @Override
+    public void deleteTjOrderDetailByjxbz(String bldh) {
+        tbTransitionMapper.deleteTjOrderDetailByjxbz(bldh);
+    }
+
+    @Override
+    public String panduantaocanshifouchongfu(String idCard,Long pacId) {
+        return tbTransitionMapper.panduantaocanshifouchongfu(idCard,pacId);
+    }
+
+    @Override
+    public String ttpanduantaocanshifouchongfu(String idCard,Long pacId) {
+        return tbTransitionMapper.ttpanduantaocanshifouchongfu(idCard,pacId);
+    }
+
+    @Override
+    public List<TbTransition> newgetTransitionList(String cusId) {
+        return tbTransitionMapper.newgetTransitionList(cusId);
+    }
+
+    @Override
+    public TbTransition getOnwTbTransition(String idCard, String tjNumber) {
+        return tbTransitionMapper.getOnwTbTransition(idCard,tjNumber);
+    }
+
+    @Override
+    public List<Map<String,Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard) {
+
+        return tbTransitionMapper.addTbhuoquxiangmuchajia(groupingId,cusIdCard);
+    }
+
+    @Override
+    public void buxiangmuchajia(String idCard, String pacId,String proId, BigDecimal cj) {
+       tbTransitionMapper.buxiangmuchajia( idCard, pacId,proId, cj);
+    }
+
+    @Override
+    public String getTbTransitionPacId(String cusId) {
+        return tbTransitionMapper.getTbTransitionPacId(cusId);
+    }
+
+    @Override
+    public BigDecimal getTbTransitionNewPriceByTjNumAndParentId(String tjNum, String proId) {
+        return tbTransitionMapper.getTbTransitionNewPriceByTjNumAndParentId(tjNum,proId);
+    }
+
+
+    @Override
+    public BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(String tjNum, String proId) {
+        return tbTransitionMapper.getTbTransitionOrdPriceByTjNumAndParentId(tjNum,proId);
+    }
 }

--
Gitblit v1.8.0