From c0ee7d43fdd2aed5e22bfbf90eb3eb1377bf5041 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 22 四月 2026 17:26:47 +0800
Subject: [PATCH] 【景宁】/smartor/serviceSubtask/getSfStatistics 随访增加 nonFollowUpInfo 无需随访详情

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 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 79c133a..71d72c3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -1,5 +1,6 @@
 package com.smartor.domain;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -30,11 +31,11 @@
     @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;
 
@@ -50,7 +51,7 @@
     @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
     private List<Long> subTaskIds;
 
-    @ApiModelProperty(value = "绉戝鐥呭尯")
+    @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁�  2锛岀瀹ょ粺璁�")
     private Integer statisticaltype;
 
     private String visitDeptCode;
@@ -73,6 +74,23 @@
 
     @ApiModelProperty(value = "鏌ヨ鍙傛暟瀵瑰簲鍊� joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
     private String configValue;
+
+    @ApiModelProperty(value = "缁х画鏍囪瘑:1 娌�  2鏈�")
+    private Integer continueFlag;
+
+    @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date continueTimeNow;
+
+    @ApiModelProperty(value = "缁х画鍐呭")
+    private JSONObject continueContent;
+
+    @ApiModelProperty(value = "缁х画娆℃暟")
+    private Integer continueCount;
+
+    @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date continueTimeNext;
 
     /**
      * 鏈烘瀯缂栫爜
@@ -103,6 +121,13 @@
      */
     @ApiModelProperty(value = "鍒嗙粍key")
     private String groupKey;
+
+    /**
+     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+     */
+    @ApiModelProperty(value = "缁熻鏂瑰紡")
+    private String followUpCountStyle;
+
     /**
      * 鍒嗙粍code闆嗗悎
      */
@@ -120,4 +145,4 @@
      */
     @ApiModelProperty("pageSize")
     private Integer pageSize;
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3