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/ITjOrderService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 4074d4c..fc1a41a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -126,7 +126,7 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘)
Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
- Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
+ Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory);
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
@@ -163,6 +163,8 @@
List<String> getHuoQuBlZlsqdh(String cardId, String bldh);
Boolean delHuoQuZlsqdh(String cardId, String bldh);
+ int getOrderCountByTjNum(String tjNum);
+
Map<String,Object> getgetBghsList(String tjNumber, Integer page, Integer pageSize, String value, String beginTime, String endTime, String name);
@@ -183,9 +185,16 @@
List<String> getJianChaTjNum();
+ List<String> getJianChaTjNumWsh();
+
void tjQiandaodengji(String tjNum);
void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime);
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
+ Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
+ String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
}
--
Gitblit v1.8.0