From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
index c79c8a5..9b2310e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
@@ -78,7 +78,9 @@
@Select("\n" +
"SELECT aa.bg_type, aa.dw_name,aa.batch,aa.dept,sum(aa.people_count) people_count,sum(aa.yj_count) yj_count,(sum(aa.people_count)-sum(aa.yj_count))wj_count FROM (\n" +
"\n" +
- "SELECT '鍥綋' bg_type, a.company dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count FROM tj_reservation a WHERE a.deleted=0 AND a.grouping_id IN (\n" +
+ "SELECT '鍥綋' bg_type, r.cn_name dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count FROM tj_reservation a " +
+ "LEFT JOIN dict_comp r ON a.company_id=r.drug_manufacturer_id" +
+ " WHERE a.deleted=0 AND a.grouping_id IN (\n" +
"\n" +
" SELECT b.id FROM tj_dw_grouping b WHERE b.deleted=0 AND b.dw_dept_id=#{dwDeptId}\n" +
"\t \n" +
--
Gitblit v1.8.0