From db66708485ab4b499afe1ee60e3431c85e4bd42e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 22 七月 2025 16:13:35 +0800
Subject: [PATCH] zjh20250722

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 985f52d..d9d57fd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -346,26 +346,28 @@
 
 
     @Select("SELECT\n" +
-            " DISTINCT a.tj_number \n" +
-            "FROM\n" +
-            "  tj_order_remark a\n" +
-            "  JOIN sys_dept b ON b.dept_id = a.dept_id \n" +
-            "WHERE\n" +
-            "  a.deleted = 0 \n" +
-            "  AND b.org_type = 1 \n" +
-            "  AND a.type=0")
+            "       DISTINCT a.tj_number \n" +
+            "      FROM\n" +
+            "        tj_order_remark a\n" +
+            "        JOIN sys_dept b ON b.dept_id = a.dept_id \n" +
+            "        JOIN tj_order o ON a.tj_number = o.tj_number\n" +
+            "      WHERE\n" +
+            "        a.deleted = 0 \n" +
+            "        AND b.org_type = 1 \n" +
+            "        AND a.type=0 AND o.deleted = 0")
     List<String> getDingShiTongBuJianYanTjNum();
 
 
-    @Select("  SELECT\n" +
-            " DISTINCT a.tj_number \n" +
-            "FROM\n" +
-            "  tj_order_remark a\n" +
-            "  JOIN sys_dept b ON b.dept_id = a.dept_id \n" +
-            "WHERE\n" +
-            "  a.deleted = 0 \n" +
-            "  AND b.org_type = 2 \n" +
-            "  AND a.type =0")
+    @Select("SELECT\n" +
+            "             DISTINCT a.tj_number\n" +
+            "            FROM\n" +
+            "              tj_order_remark a\n" +
+            "              JOIN sys_dept b ON b.dept_id = a.dept_id\n" +
+            "              JOIN tj_order o ON o.tj_number = a.tj_number\n" +
+            "            WHERE\n" +
+            "              a.deleted = 0\n" +
+            "              AND b.org_type = 2\n" +
+            "              AND a.type =0 AND o.deleted = 0")
     List<String> getDingShiTongBuJianChaTjNum();
 
 
@@ -397,4 +399,8 @@
     @Select("SELECT DISTINCT a.tjh FROM ltkj_exam_jcbgd a WHERE ISNULL(a.xmdm)")
     List<String> shoudongtbjcbgdsj();
 
+    @Select("SELECT COUNT(*) FROM tj_order a WHERE a.deleted=0 AND " +
+            "(a.firm_id=#{compId} OR a.team_no=#{teamNo}) AND a.pac_id=#{pacId}")
+    Integer getTjTeamSelectRecordCount(@Param("teamNo") String teamNo,@Param("compId") String compId,@Param("pacId") String pacId);
+
 }

--
Gitblit v1.8.0