From 300d877312a800c93aef61f1d9b3b0890343dfad Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 28 五月 2026 18:03:08 +0800
Subject: [PATCH] 【丽水】原人工、微信、短信、AI  计算方式修改为   随访成功中的人工、微信、短信、AI人次 参数 followUpCountStyle =3 控制

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index 3f2b31a..c796fd1 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -26,16 +26,22 @@
 
     private Integer visitCount;
 
+    /**
+     * rateDay 浠h〃鍑犲ぉ鍙婃椂鐜�
+     */
+    @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
+    private Integer rateDay;
+
     private Integer isVisitAgain;
 
     @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
     private Integer isabnormal;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     private Date endTime;
 
@@ -51,7 +57,7 @@
     @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
     private List<Long> subTaskIds;
 
-    @ApiModelProperty(value = "绉戝鐥呭尯")
+    @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁�  2锛岀瀹ょ粺璁�")
     private Integer statisticaltype;
 
     private String visitDeptCode;
@@ -79,6 +85,7 @@
     private Integer continueFlag;
 
     @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date continueTimeNow;
 
     @ApiModelProperty(value = "缁х画鍐呭")
@@ -88,6 +95,7 @@
     private Integer continueCount;
 
     @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date continueTimeNext;
 
     /**
@@ -121,7 +129,7 @@
     private String groupKey;
 
     /**
-     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
      */
     @ApiModelProperty(value = "缁熻鏂瑰紡")
     private String followUpCountStyle;
@@ -133,6 +141,48 @@
     private List<String> groupKeyList;
 
     /**
+     * 鍙戦�佺姸鎬� - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴�")
+    private List<Long> sendstates;
+
+    /**
+     * 寮傚父鏍囪瘑 - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+    private String excep;
+
+    /**
+     * 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
+    private String currentPreachform;
+
+    /**
+     * 闅忚鎯呭喌 - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "闅忚鎯呭喌:1姝e父璇煶,2鎮h�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6琚繃婊�,7鍏跺畠")
+    private Integer taskSituation;
+
+    /**
+     * 鍑洪櫌鐥呭尯缂栧彿 - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+    private String leavehospitaldistrictcode;
+
+    /**
+     * 鍑洪櫌绉戝缂栧彿 - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "鍑洪櫌绉戝缂栧彿")
+    private String deptcode;
+
+    /**
+     * 瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨� - 瓒呴摼鎺ョ粺璁�
+     */
+    @ApiModelProperty(value = "瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨�")
+    private String hyperLinkInfoType;
+
+    /**
      * pageNum
      */
     @ApiModelProperty("pageNum")

--
Gitblit v1.9.3