From 732024c03df1d810b8f5a8a526066967f1bfbb5d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 六月 2026 17:53:27 +0800
Subject: [PATCH] 南华部分功能提交

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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..c27d624 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -2,7 +2,6 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,6 +44,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 +64,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 +136,7 @@
     private String groupKey;
 
     /**
-     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+     * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
      */
     @ApiModelProperty(value = "缁熻鏂瑰紡")
     private String followUpCountStyle;
@@ -182,6 +189,24 @@
     @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;
+
     /**
      * pageNum
      */

--
Gitblit v1.9.3