From b7d7d80a8a9e9ac145a05b5e1d545b6b61fc0cc4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 30 五月 2025 18:17:33 +0800
Subject: [PATCH] zjh20250530
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 f510684..f4ab2ee 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
@@ -88,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" +
@@ -108,6 +108,6 @@
@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.dw_id=#{dwId} AND a.sex=#{sex} GROUP BY b.grouping_id")
+ "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);
}
--
Gitblit v1.8.0