From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 9eb718c..c2c9b6e 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
@@ -4,6 +4,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ltkj.hosp.domain.TjDwGrouping;
+import com.ltkj.hosp.domain.TjPackage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -87,7 +88,7 @@
     public int selectTjDwGroupingByDwDeptId(String dwDeptId);
 
 
-    @Select("SELECT SUM(b.aa) cc FROM ( SELECT\n" +
+    @Select("SELECT IFNULL(SUM(b.aa),0) cc FROM ( SELECT\n" +
             "            CASE WHEN ISNULL( b.sex )\n" +
             "            AND ISNULL( c.pro_name ) THEN 0\n" +
             "            WHEN !ISNULL( b.sex )\n" +
@@ -103,4 +104,17 @@
             "            GROUP BY\n" +
             "            b.sex)b")
     public int selectTjDwGroupingByDwId(String dwId);
+
+
+
+    @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM   tj_dw_grouping a  JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
+            "WHERE a.deleted=0 and a.dw_id=#{dwId} AND (a.sex=#{sex} or a.sex=2) GROUP BY b.grouping_id")
+    List<TjPackage> huoqutuantitaocanxiangmu(@Param("dwId") String dwId,@Param("sex") Long sex);
+
+
+//    @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM  " +
+//            " tj_dw_grouping a  JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
+//            "WHERE a.deleted=0 and if(#{dwId}!=null,a.dw_id=#{dwId},1=1)  GROUP BY b.grouping_id")
+
+    List<TjPackage> huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(@Param("dwId") String dwId);
 }

--
Gitblit v1.8.0