From c0988ce95ab6a518aefe843d9cfd84d1515cdc00 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 15 十月 2026 16:18:40 +0800
Subject: [PATCH] 【丽水】1. /smartor/serviceSubtask/getCurrentUserServiceSubtaskCount工作台里加即将超时数量字段      2. /smartor/serviceSubtask/querySubtaskList 给一个列表可以查询多少小时(可选)即将超时的随访服务,如:48小时内即将超时任务(今天15号10.40到17号10.40这段时间会到达超时时间的任务)

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index b085309..43b826b 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -32,6 +32,10 @@
     @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
     private Integer rateDay;
 
+    /**
+     * 鏄惁鍐嶆闅忚
+     */
+    @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
     private Integer isVisitAgain;
 
     @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
@@ -45,6 +49,14 @@
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     private Date endTime;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍑洪櫌寮�濮嬫椂闂�")
+    private Date hospitalStartTime;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍑洪櫌缁撴潫鏃堕棿")
+    private Date hospitalEndTime;
+
     @ApiModelProperty(value = "鏈嶅姟绫诲瀷")
     private List<Long> serviceType;
 
@@ -57,7 +69,7 @@
     @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
     private List<Long> subTaskIds;
 
-    @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁�  2锛岀瀹ょ粺璁�")
+    @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁�  2锛岀瀹ょ粺璁�  3. 鐥呯缁熻")
     private Integer statisticaltype;
 
     private String visitDeptCode;
@@ -129,7 +141,7 @@
     private String groupKey;
 
     /**
-     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
      */
     @ApiModelProperty(value = "缁熻鏂瑰紡")
     private String followUpCountStyle;
@@ -182,6 +194,41 @@
     @ApiModelProperty(value = "瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨�")
     private String hyperLinkInfoType;
 
+    @ApiModelProperty(value = "浠诲姟ID", required = true)
+    private Long taskId;
+
+    @ApiModelProperty(value = "taskIds闆嗗悎")
+    private List<Long> taskIds;
+
+    @ApiModelProperty(value = "浠诲姟鍚嶇О")
+    private String taskName;
+
+    @ApiModelProperty(value = "taskNamee闆嗗悎")
+    private List<String> taskNames;
+
+    @ApiModelProperty(value = "鐤剧梾鐥呯")
+    private String diagType;
+
+    @ApiModelProperty(value = "diagType闆嗗悎")
+    private List<String> diagTypes;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鍙戦�佹椂闂�")
+    private Date visittime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+    private Date finishtime;
+
+    @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖  2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴锛�")
+    private String hospType;
+
+    /**
+     * 浜哄伐鐢佃瘽鏍囪
+     */
+    @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+    private Long isManuallyCalled;
+
     /**
      * pageNum
      */

--
Gitblit v1.9.3