From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 04bc44d..64f2e54 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -68,7 +68,7 @@
      */
     @Override
     public List<TjOrder> selectExportOrderList(TjOrder tjOrder) {
-        List<TjOrder> tjOrders = tjOrderMapper.selectExportOrderList(tjOrder);
+        List<TjOrder> tjOrders = tjOrderMapper.selectTjOrderList(tjOrder);
         for (TjOrder order : tjOrders) {
             if (order.getUserId()!=null){
                 TjCustomer byId = customerService.getById(order.getUserId());
@@ -226,7 +226,7 @@
 
     @Override
     public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
-                                                          String compId, String beginTime, String endTime, String tjname) {
+                                                          String compId, String beginTime, String endTime, String tjname,String tjCategory) {
 
         Map<String, Object> map = new HashMap<>();
         map.put("checkStatus",checkStatus);
@@ -237,6 +237,7 @@
         map.put("tjname",tjname);
         map.put("beginTime",beginTime);
         map.put("endTime",endTime);
+        map.put("p_tjCategory",tjCategory);
         List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
         Map<String,Object> map1=new HashMap<>();
         map1.put("customers",list);
@@ -246,7 +247,8 @@
     }
 
     @Override
-    public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus, String compId, String beginTime, String endTime, String tjname) {
+    public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize,
+                                                               Integer checkStatus, String compId, String beginTime, String endTime, String tjname,String tcm) {
         Map<String, Object> map = new HashMap<>();
         map.put("checkStatus",checkStatus);
         map.put("page",page);
@@ -254,6 +256,7 @@
         map.put("tjNumber",tjNumber);
         map.put("compId",compId);
         map.put("tjname",tjname);
+        map.put("tcm",tcm);
         map.put("beginTime",beginTime);
         map.put("endTime",endTime);
         List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map);
@@ -356,6 +359,11 @@
     }
 
     @Override
+    public int getOrderCountByTjNum(String tjNum) {
+        return tjOrderMapper.getOrderCountByTjNum(tjNum);
+    }
+
+    @Override
     public Map<String, Object> getgetBghsList(String tjNumber, Integer page, Integer pageSize,
                                               String compId, String beginTime, String endTime, String tjname) {
         Map<String, Object> map = new HashMap<>();
@@ -431,7 +439,8 @@
     }
 
     @Override
-    public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime) {
+    public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt,
+                                             String tjNum, String name, String dw, String djbeginTime, String djendTime) {
 
         Map<String, Object> map = new HashMap<>();
         map.put("page",pageNum);
@@ -449,4 +458,25 @@
         map1.put("total",map.get("total"));
         return map1;
     }
+
+    @Override
+    public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize,
+                                           String compId, String beginTime, String endTime, String tjname,String tcm,String deptId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("checkStatus",checkStatus);
+        map.put("page",page);
+        map.put("pageSize",pageSize);
+        map.put("tjNumber",tjNumber);
+        map.put("compId",compId);
+        map.put("tjname",tjname);
+        map.put("tcm",tcm);
+        map.put("beginTime",beginTime);
+        map.put("endTime",endTime);
+        map.put("ks",deptId);
+        List<List<?>> list = tjOrderMapper.getYxJcList(map);
+        Map<String,Object> map1=new HashMap<>();
+        map1.put("customers",list);
+        map1.put("total",map.get("total"));
+        return map1;
+    }
 }

--
Gitblit v1.8.0