From 3d274e016ae6f40cea86254af6c6f32691978ab8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 四月 2026 15:40:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index f134da8..7608a6a 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -118,6 +118,9 @@
@Excel(name = " 棣栨闅忚澶辫触 ")
private Long followUpFail = 0L;
+ @ApiModelProperty(value = "鏃犻渶闅忚璇︽儏")
+ private List<ServiceSubtask> nonFollowUpInfo;
+
@ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
private List<ServiceSubtask> needFollowUpInfo;
@@ -132,6 +135,9 @@
@ApiModelProperty(value = "棣栨闅忚浜哄伐璇︽儏")
private List<ServiceSubtask> manualInfo;
+
+ @ApiModelProperty(value = "棣栨闅忚璇煶璇︽儏")
+ private List<ServiceSubtask> voiceInfo;
@ApiModelProperty(value = "棣栨闅忚鐭俊璇︽儏")
private List<ServiceSubtask> smsInfo;
@@ -154,6 +160,9 @@
@ApiModelProperty(value = "鍐嶆闅忚浜哄伐璇︽儏")
private List<ServiceSubtask> manualAgainInfo;
+ @ApiModelProperty(value = "鍐嶆闅忚璇煶璇︽儏")
+ private List<ServiceSubtask> voiceAgainInfo;
+
@ApiModelProperty(value = "鍐嶆闅忚鐭俊璇︽儏")
private List<ServiceSubtask> smsAgainInfo;
@@ -164,6 +173,10 @@
@Excel(name = " 鍙婃椂鐜� ")
private Double rate = 0.0;
+ @ApiModelProperty(value = "瀹屾垚鐜�")
+ @Excel(name = " 瀹屾垚鐜� ")
+ private Double finishRate = 0.0;
+
@ApiModelProperty(value = "棣栨闅忚鐜�")
@Excel(name = " 棣栨闅忚鐜� ")
private String followUpRate;
@@ -171,6 +184,10 @@
@ApiModelProperty(value = "棣栨浜哄伐")
@Excel(name = " 棣栨浜哄伐 ")
private Long manual = 0L;
+
+ @ApiModelProperty(value = "棣栨璇煶")
+ @Excel(name = " 棣栨璇煶 ")
+ private Long voice = 0L;
@ApiModelProperty(value = "棣栨鐭俊")
@Excel(name = " 棣栨鐭俊 ")
@@ -207,10 +224,13 @@
@Excel(name = " 浜屾浜哄伐 ")
private Long manualAgain = 0L;
+ @ApiModelProperty(value = "浜屾璇煶")
+ @Excel(name = " 浜屾璇煶 ")
+ private Long voiceAgain = 0L;
+
@ApiModelProperty(value = "浜屾鐭俊")
@Excel(name = " 浜屾鐭俊 ")
private Long smsAgain = 0L;
- @Excel(name = " 浜屾寰俊 ")
@ApiModelProperty(value = "浜屾寰俊")
private Long weChatAgain = 0L;
--
Gitblit v1.9.3