From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
index 2a8e164..43fc52d 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
@@ -103,6 +103,14 @@
@Excel(name = " 鍑洪櫌浜烘 ")
private Integer dischargeCount = 0;
+ @ApiModelProperty(value = "棣栨鍑洪櫌浜烘锛坴isitCount = 1锛�")
+ @Excel(name = " 棣栨鍑洪櫌浜烘 ")
+ private Long firstDischargeCount = 0L;
+
+ @ApiModelProperty(value = "鍐嶆闅忚鎺ㄩ�佷汉鏁帮紙棣栦釜鍐嶆闅忚涓旀墽琛岀瀹や负闅忚涓績锛夊啀娆￠殢璁挎帹閫佺巼锛堝啀娆￠殢璁挎帹閫佷汉鏁� / 棣栨鍑洪櫌浜烘锛�")
+ @Excel(name = " 鍐嶆闅忚鎺ㄩ�佷汉鏁� ")
+ private Long againFollowUpPushCount = 0L;
+
@ApiModelProperty(value = "鏃犻渶闅忚浜烘")
@Excel(name = " 鏃犻渶闅忚浜烘 ")
private Long nonFollowUp = 0L;
@@ -114,6 +122,10 @@
@ApiModelProperty(value = "搴旈殢璁夸汉娆�")
@Excel(name = " 搴旈殢璁夸汉娆� ")
private Long followUpNeeded = 0L;
+
+ @ApiModelProperty(value = "浜哄伐宸叉嫧閫氭�婚噺")
+ @Excel(name = " 浜哄伐宸叉嫧閫氭�婚噺 ")
+ private Long manuallyCalled = 0L;
@ApiModelProperty(value = "棣栨鏃犻渶闅忚")
private Long nonFollowUpFirst = 0L;
@@ -133,6 +145,10 @@
@ApiModelProperty(value = "棣栨闅忚澶辫触")
@Excel(name = " 棣栨闅忚澶辫触 ")
private Long followUpFail = 0L;
+
+ @ApiModelProperty(value = "鍙婃椂闅忚浜烘锛堝凡瀹屾垚涓旀湭瓒呮椂锛宖inish_state=1锛�")
+ @Excel(name = " 鍙婃椂闅忚浜烘 ")
+ private Long timelyFollowUp = 0L;
@ApiModelProperty(value = "鍑洪櫌浜烘璇︽儏")
private List<ServiceSubtask> dischargeCountInfo;
@@ -154,6 +170,9 @@
@ApiModelProperty(value = "棣栨闅忚澶辫触璇︽儏")
private List<ServiceSubtask> followUpFailInfo;
+
+ @ApiModelProperty(value = "鍙婃椂闅忚璇︽儏")
+ private List<ServiceSubtask> timelyFollowUpInfo;
@ApiModelProperty(value = "棣栨闅忚浜哄伐璇︽儏")
private List<ServiceSubtask> manualInfo;
@@ -268,6 +287,46 @@
@Excel(name = " 浜屾寰呴殢璁� ")
private Long pendingFollowUpAgain = 0L;
+ @ApiModelProperty(value = "棣栨闅忚浜哄伐鐢佃瘽瓒呮椂锛坰endstate=7 涓� isManuallyCalled=0锛�")
+ @Excel(name = " 棣栨闅忚浜哄伐鐢佃瘽瓒呮椂 ")
+ private Long manualCallTimeout = 0L;
+
+ @ApiModelProperty(value = "鍐嶆闅忚浜哄伐鐢佃瘽瓒呮椂锛坰endstate=7 涓� isManuallyCalled=0锛�")
+ @Excel(name = " 鍐嶆闅忚浜哄伐鐢佃瘽瓒呮椂 ")
+ private Long manualCallTimeoutAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮叏閮紙sendstate in 1,2,3,7锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮叏閮� ")
+ private Long pendingFollowUpAll = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮叏閮紙sendstate in 1,2,3,7锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮叏閮� ")
+ private Long pendingFollowUpAllAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮緟鍙戦�侊紙sendstate in 1,2锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮緟鍙戦�� ")
+ private Long pendingFollowUpWaitSend = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮緟鍙戦�侊紙sendstate in 1,2锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮緟鍙戦�� ")
+ private Long pendingFollowUpWaitSendAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮凡鍙戦�侊紙sendstate in 3,7锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮凡鍙戦�� ")
+ private Long pendingFollowUpSent = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮凡鍙戦�侊紙sendstate in 3,7锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮凡鍙戦�� ")
+ private Long pendingFollowUpSentAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨宸插彂閫侊紙sendstate=3锛�")
+ @Excel(name = " 棣栨宸插彂閫� ")
+ private Long sent = 0L;
+
+ @ApiModelProperty(value = "鍐嶆宸插彂閫侊紙sendstate=3锛�")
+ @Excel(name = " 鍐嶆宸插彂閫� ")
+ private Long sentAgain = 0L;
+
@ApiModelProperty(value = "浜屾闅忚鎴愬姛")
@Excel(name = " 浜屾闅忚鎴愬姛 ")
private Long followUpSuccessAgain = 0L;
@@ -275,6 +334,10 @@
@ApiModelProperty(value = "浜屾闅忚澶辫触")
@Excel(name = " 浜屾闅忚澶辫触 ")
private Long followUpFailAgain = 0L;
+
+ @ApiModelProperty(value = "鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡锛坰uggest=6锛�")
+ @Excel(name = " 鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡 ")
+ private Long suggest6CountAgain = 0L;
@ApiModelProperty(value = "浜屾闅忚鐜�")
@Excel(name = " 浜屾闅忚鐜� ")
@@ -377,6 +440,16 @@
private String groupCode;
/**
+ * 鍒嗙粍閿搴旂殑鏄剧ず鍚嶏紙鐥呭尯缁熻鏃跺嵆璇ョ粍鐨勭梾鍖哄悕锛夈��
+ * <p>
+ * 浠呮湇鍔＄鍐呴儴浣跨敤锛氬師鏉ョ梾鍖哄垪鍙栫殑鏄� {@code MAX(hospitaldistrictname)}锛�
+ * 涓�涓粍閲屾贩浜嗗涓梾鍖烘椂灏变細闅忔満鏄剧ず鍏朵腑涓�涓紙閫夎娑插唴绉戠梾鍖哄嵈鏄剧ず鈥滈绉戜腑蹇冧笁鐥呭尯鈥濓級銆�
+ * 鏀规垚鎸夊垎缁勯敭鍙栧悕瀛楋紝鍐嶅洖濉埌鐥呭尯 code/name 瀛楁銆�
+ */
+ @JsonIgnore
+ private String groupName;
+
+ /**
* 棣栨闅忚璁板綍鏁帮紙visit_count = 1 鐨勮鏁帮級銆�
* <p>
* 浠呮湇鍔＄鍐呴儴浣跨敤锛氬師鍐呭瓨缁熻閲屸�滈娆￠殢璁跨巼鈥濆彧鍦ㄨ鍒嗙粍瀛樺湪棣栨闅忚璁板綍鏃舵墠浼氳璧嬪��
--
Gitblit v1.9.3