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/TjAsyncService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
index 8bf4ce1..e6bd50e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
@@ -30,12 +30,12 @@
void abandonCheck(String tjNumber, TjOrder tjOrder, List<TjOrderDetail> list, SysUser sysUser);
//鍖荤敓妫�鏌ュ畬姣曞悗浣撴鐘舵�佸強鏄惁寮傚父淇敼
- void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser,TjOrder order);
+ void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser,TjOrder order,TjOrderRemark orderRemark);
void updateOrdeltile2(TjOrderDetail tjOrderDetail, SysUser sysUser);
//鍗曢」鏀惰垂
- void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser);
+ Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser,String jxbz);
//鍖荤敓妫�鏌ュ悜缂撳瓨涓坊鍔犳暟鎹�(鏁翠綋瀛樺叆)
@@ -67,7 +67,7 @@
void addRedisTransitionPac(String cusId, Long pacId, List<TjPackageProject> ppList);
- void saveRedisTransitionByPacId(String cusId, Long pacId,List<Long> proIds);
+ void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId,List<Long> proIds);
//娣诲姞涓存椂琛ㄥ崟椤�
void addRedisTransitionPro(String cusId, List<Long> proIds);
@@ -106,4 +106,5 @@
void addTjChargingStandard(TjOrder order, List<TbTransition> tbTransitionList, SysUser sysUser);
+ void tjUpdateDetatilByVi(String s);
}
--
Gitblit v1.8.0