From 051964f3cd65e421681a8af7b90c27011c36650d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 九月 2026 10:29:53 +0800
Subject: [PATCH] 1.门诊满意度综合得分排名（按科室或病区） 修改serviceTypes
---
smartor/src/main/java/com/smartor/domain/VO/MzMydScoreRankVO.java | 8 +++++++-
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 5 +++--
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 13 +++++++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/VO/MzMydScoreRankVO.java b/smartor/src/main/java/com/smartor/domain/VO/MzMydScoreRankVO.java
index 69b1e75..48c9445 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/MzMydScoreRankVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/MzMydScoreRankVO.java
@@ -33,7 +33,7 @@
* 鏈嶅姟绫诲瀷锛岄粯璁� 14锛堥棬璇婃弧鎰忓害璋冩煡锛�
*/
@ApiModelProperty(value = "鏈嶅姟绫诲瀷锛岄粯璁�14锛堥棬璇婃弧鎰忓害璋冩煡锛�")
- private String serviceType = "14";
+ private List<String> serviceTypes;
/**
* 绉戝缂栧彿闆嗗悎锛屼负绌鸿〃绀哄叏閮ㄧ瀹わ紙鎸夌瀹ょ粺璁℃椂浣跨敤锛�
@@ -68,4 +68,10 @@
*/
@ApiModelProperty(value = "鍙繑鍥炲墠N鍚嶏紝涓虹┖鎴栧皬浜庣瓑浜�0琛ㄧず杩斿洖鍏ㄩ儴")
private Integer limit;
+
+ /**
+ * 闂鍐呭
+ */
+ @ApiModelProperty(value = "闂鍐呭")
+ private String questionText;
}
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 7e5e14a..bccc1e4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -6433,8 +6433,9 @@
if (StringUtils.isEmpty(mzMydScoreRankVO.getDimensionType())) {
mzMydScoreRankVO.setDimensionType("1");
}
- if (StringUtils.isEmpty(mzMydScoreRankVO.getServiceType())) {
- mzMydScoreRankVO.setServiceType("14");
+ if (CollectionUtils.isEmpty(mzMydScoreRankVO.getServiceTypes())) {
+ List<String> list=new ArrayList<>(Arrays.asList("14"));
+ mzMydScoreRankVO.setServiceTypes(list);
}
List<MzMydScoreRankDTO> list = serviceSubtaskMapper.selectMzMydScoreRank(mzMydScoreRankVO);
if (CollectionUtils.isEmpty(list)) {
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e56443a..f902060 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -3036,7 +3036,7 @@
ROUND(avg(d.score), 2) AS totalScore
FROM service_subtask_detail d
JOIN service_task t ON d.taskid = t.taskid
- WHERE t.service_type IN (6, 14)
+ WHERE t.service_type IN (14)
AND t.del_flag = 0
AND d.del_flag = 0
AND d.create_time >= #{startFinishTime}
@@ -3493,7 +3493,13 @@
WHERE s.del_flag = '0'
AND d.del_flag = '0'
AND s.sendstate = 6
- AND s.service_type = #{serviceType}
+ <if test="serviceTypes != null and serviceTypes.size() > 0">
+ AND service_type IN
+ <foreach collection="serviceTypes" item="serviceType" open="(" separator=","
+ close=")">
+ #{serviceType}
+ </foreach>
+ </if>
<!-- <!– 鍙彇鍏紡閲岀殑浜旀。鏉冮噸锛岀┖鍊�/0/鏈瓟绛夋棦涓嶈繘鍒嗗瓙涔熶笉杩涘垎姣� –>-->
<!-- AND CAST(d.score AS DECIMAL(10,4)) IN (1, 0.8, 0.6, 0.4, 0.2)-->
<!-- 鍚屼竴瀛愪换鍔″悓涓�棰樼洰鍙繚鐣欐渶鏂颁竴鏉★紝閬垮厤閲嶇瓟琚噸澶嶈鍏ラ」鏁� -->
@@ -3516,6 +3522,9 @@
<if test="endFinishTime != null">
AND s.finishtime < DATE_ADD(#{endFinishTime}, INTERVAL 1 DAY)
</if>
+ <if test="questionText != null and questionText != ''">and d.questiontext like concat('%', #{questionText},
+ '%')
+ </if>
<choose>
<when test='dimensionType == "2"'>
AND s.leavehospitaldistrictcode IS NOT NULL AND s.leavehospitaldistrictcode <> ''
--
Gitblit v1.9.3