From 7303db54c1a2b672e4623cd022939b56882685ca Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 23 十二月 2025 13:33:02 +0800
Subject: [PATCH] 【丽水】获取随访统计比例 优化
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 36 ++++++++++++------
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 2
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 36 ++++++++++++++++-
3 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index df7eb90..241a592 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -101,7 +101,7 @@
public List<ServiceSubtask> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq);
- public List<ServiceSubtask> getSfStatistics1(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ public List<ServiceSubtask> getSfStatisticsOld(ServiceSubtaskCountReq serviceSubtaskCountReq);
public List<ServiceSubtaskCount> getSfStatisticsJoy(ServiceSubtaskCountReq serviceSubtaskCountReq);
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 7b2298d..cde04a1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2198,7 +2198,7 @@
}
/**
- * 鑾峰彇闅忚缁熻姣斾緥
+ * 鑾峰彇闅忚缁熻姣斾緥锛堜紭鍖栫増鏈級
*
* @param serviceSubtaskCountReq
* @return
@@ -2208,22 +2208,28 @@
public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
-// List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ // 浼樺寲锛氬彧鏌ヨ涓�娆℃暟鎹簱锛岄伩鍏嶉噸澶嶆煡璇�
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ if (CollectionUtils.isEmpty(rawData)) {
+ return serviceSubtaskStatistics;
+ }
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
}
} else if (serviceSubtaskCountReq.getDeptcodes() != null && serviceSubtaskCountReq.getDeptcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
}
}
@@ -2278,7 +2284,7 @@
}
/**
- * 鑾峰彇闅忚缁熻姣斾緥
+ * 鑾峰彇闅忚缁熻姣斾緥锛堜紭鍖栫増鏈級
*
* @param serviceSubtaskCountReq
* @return
@@ -2289,22 +2295,28 @@
log.error("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
+ // 浼樺寲锛氬彧鏌ヨ涓�娆℃暟鎹簱锛岄伩鍏嶉噸澶嶆煡璇�
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ if (CollectionUtils.isEmpty(rawData)) {
+ return serviceSubtaskStatistics;
+ }
+
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
String orgid = null;
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
-
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
}
} else if (serviceSubtaskCountReq.getDeptcodes() != null && serviceSubtaskCountReq.getDeptcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
}
}
List<ServiceSubtaskCount> joySubCount = serviceSubtaskMapper.getSfStatisticsJoy(serviceSubtaskCountReq);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 3c67651..532b087 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -490,7 +490,8 @@
</where>
</select>
- <select id="selectTimelyRate" parameterType="com.smartor.domain.ServiceSubtask" resultType="double">
+ <!-- 鍘熸湁鏌ヨ锛屾�ц兘宸� -->
+ <select id="selectTimelyRateOld" parameterType="com.smartor.domain.ServiceSubtask" resultType="double">
SELECT sum( a.finished )/ sum( 1 ) FROM
(SELECT id, visit_time, finishtime,
(CASE WHEN ( DATE_FORMAT( visit_time, '%y%m%d' )< DATE_FORMAT( IF ( ISNULL( finishtime ), NOW(), finishtime
@@ -517,6 +518,35 @@
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
) a
+ </select>
+
+ <!-- 浼樺寲鍚庣殑鍙婃椂鐜囨煡璇細鐩存帴鍦� WHERE 涓绠楋紝閬垮厤瀛愭煡璇� -->
+ <select id="selectTimelyRate" parameterType="com.smartor.domain.ServiceSubtask" resultType="double">
+ SELECT
+ SUM(CASE WHEN DATE(visit_time) < DATE(COALESCE(finishtime, NOW())) THEN 1 ELSE 0 END) / COUNT(*)
+ FROM service_subtask
+ WHERE del_flag=0
+ <if test="starttime == null and endtime==null">
+ AND visit_time < NOW()
+ </if>
+ <if test="starttime != null and endtime!=null">
+ <!-- 浼樺寲锛氫娇鐢ㄦ棩鏈熻寖鍥存煡璇㈡浛浠� date_format -->
+ AND visit_time >= #{starttime}
+ AND visit_time < DATE_ADD(#{endtime}, INTERVAL 1 DAY)
+ </if>
+ <if test="orgid != null and orgid != ''">AND orgid = #{orgid}</if>
+ <if test="deptcode != null and deptcode != ''">AND deptcode = #{deptcode}</if>
+ <if test="drcode != null and drcode != ''">AND drcode = #{drcode}</if>
+ <if test="deptname != null and deptname != ''">AND deptname = #{deptname}</if>
+ <if test="isabnormal != null">AND isabnormal = #{isabnormal}</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ AND leavehospitaldistrictcode = #{leavehospitaldistrictcode}
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ AND leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
+ <if test="managementDoctorCode != null">AND management_doctor_code = #{managementDoctorCode}</if>
+ <if test="managementDoctor != null">AND management_doctor LIKE CONCAT('%',#{managementDoctor}, '%')</if>
</select>
<select id="selectTimelyRateDetail" parameterType="com.smartor.domain.ServiceSubtask"
@@ -1135,7 +1165,7 @@
</update>
- <select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsOld" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
<where>
@@ -1172,7 +1202,7 @@
</select>
<!-- 浼樺寲鍚庣殑鏌ヨ锛氬噺灏戣繑鍥炲瓧娈碉紝浼樺寲鏃ユ湡鏌ヨ锛岄伩鍏� date_format -->
- <select id="getSfStatistics1" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult">
SELECT
id,
--
Gitblit v1.9.3