From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
index 420223b..9eb718c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -65,24 +65,42 @@
     public int deleteTjDwGroupingByIds(String[] ids);
 
 
-    @Select("SELECT COUNT(*) FROM tj_dw_grouping a WHERE a.dw_dept_id=#{dwDeptId}  AND a.sex=#{sex} ")
+    @Select("SELECT COUNT(*) FROM tj_dw_grouping a WHERE a.dw_dept_id=#{dwDeptId}  AND a.sex=#{sex} AND deleted=0")
     public int selectTjDwGroupingBySex(@Param("dwDeptId")String dwDeptId,@Param("sex") String sex);
 
 
-    @Select("SELECT SUM(b.aa) cc FROM ( SELECT" +
-            "CASE WHEN ISNULL( b.sex )" +
-            "AND ISNULL( c.pro_name ) THEN 0" +
-            "WHEN ! ISNULL( b.sex )" +
-            "AND ISNULL( c.pro_name ) THEN 0 ELSE 1" +
-            "END" +
-            "aa" +
-            "FROM" +
-            "tj_dw_dept a" +
-            "LEFT JOIN tj_dw_grouping b ON a.id = b.dw_dept_id" +
-            "LEFT JOIN tj_grouping_pro c ON b.id = c.grouping_id " +
-            "WHERE" +
-            "a.id =#{dwDeptId}" +
-            "GROUP BY" +
-            "b.sex)b")
+    @Select("SELECT SUM(b.aa) cc FROM ( SELECT\n" +
+            "            CASE WHEN ISNULL( b.sex )\n" +
+            "            AND ISNULL( c.pro_name ) THEN 0\n" +
+            "            WHEN !ISNULL( b.sex )\n" +
+            "            AND ISNULL(c.pro_name ) THEN 0 ELSE 1\n" +
+            "            END\n" +
+            "            aa\n" +
+            "            FROM\n" +
+            "            tj_dw_dept a\n" +
+            "            LEFT JOIN tj_dw_grouping b ON a.id = b.dw_dept_id\n" +
+            "            LEFT JOIN tj_grouping_pro c ON b.id = c.grouping_id\n" +
+            "            WHERE\n" +
+            "            a.id =#{dwDeptId} \n" +
+            "            GROUP BY\n" +
+            "            b.sex)b")
     public int selectTjDwGroupingByDwDeptId(String dwDeptId);
+
+
+    @Select("SELECT SUM(b.aa) cc FROM ( SELECT\n" +
+            "            CASE WHEN ISNULL( b.sex )\n" +
+            "            AND ISNULL( c.pro_name ) THEN 0\n" +
+            "            WHEN !ISNULL( b.sex )\n" +
+            "            AND ISNULL(c.pro_name ) THEN 0 ELSE 1\n" +
+            "            END\n" +
+            "            aa\n" +
+            "            FROM\n" +
+            "            tj_dw_dept a\n" +
+            "            LEFT JOIN tj_dw_grouping b ON a.id = b.dw_dept_id\n" +
+            "            LEFT JOIN tj_grouping_pro c ON b.id = c.grouping_id\n" +
+            "            WHERE\n" +
+            "            a.dw_id =#{dwId} \n" +
+            "            GROUP BY\n" +
+            "            b.sex)b")
+    public int selectTjDwGroupingByDwId(String dwId);
 }

--
Gitblit v1.8.0