From b73fedc4026231b31cbc99f9fdad54c8e73a1a34 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 04 七月 2025 17:39:24 +0800
Subject: [PATCH] 2025-0704

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 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..b481e18 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();
 
 

--
Gitblit v1.8.0