From ecbb6791ae00a8a4076715b87a941c0a8557fa03 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 13 一月 2026 11:31:34 +0800
Subject: [PATCH] 【市一】采集出入院增加院区id
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f75750b..6385d61 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1203,8 +1203,12 @@
AND date_format(visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
- <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
- <if test="isabnormal != null">abd isabnormal = #{isabnormal}</if>
+ <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
+ <!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
+ <if test="type != null">
+ and type = #{type}
+ </if>
</select>
<select id="getSfStatisticsJoy" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -1330,12 +1334,18 @@
<select id="getSfStatisticsCategory" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
- SELECT a.sub_id as subTaskId,
+ SELECT
<if test="configValue != null and configValue != ''">
SUM(CASE WHEN a.categoryid IN(${configValue})
THEN 1 ELSE 0 END) AS joyAllCount,
</if>
- COUNT(sub_id) joyCount
+ <if test="configValue != null and configValue != ''">
+ SUM(CASE WHEN a.categoryid IN(${configValue})
+ AND a.matchedtext is not null
+ AND a.matchedtext != ''
+ THEN 1 ELSE 0 END) AS joyCount,
+ </if>
+ a.sub_id as subTaskId
FROM service_subtask_detail a
INNER JOIN service_subtask t ON a.sub_id = t.id
where 1=1
--
Gitblit v1.9.3