From 41362e7cd2ffa5d6110465b1ea8c41cb109a549e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 12 三月 2026 10:12:20 +0800
Subject: [PATCH] 【丽水】查询指标和关联的指标选项 增加OrgId注解
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index f6654bf..754cc2f 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;
@@ -47,6 +48,9 @@
@ApiModelProperty(value = "绉戝Code闆嗗悎")
private List<String> deptcodes;
+ @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
+ private List<Long> subTaskIds;
+
@ApiModelProperty(value = "绉戝鐥呭尯")
private Integer statisticaltype;
@@ -71,6 +75,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;
+
/**
* 鏈烘瀯缂栫爜
*/
@@ -78,10 +99,40 @@
private String orgid;
/**
+ * 闄㈠尯缂栫爜
+ */
+ @ApiModelProperty("闄㈠尯缂栫爜")
+ private String campusid;
+
+ /**
* 闂缂栫爜-鏌ヨ浣跨敤锛屾敮鎸佸涓棶棰橈紝鐢ㄩ�楀彿鍖哄垎
*/
@ApiModelProperty(value = "闂缂栫爜")
private String scriptids;
+
+ /**
+ * 鍒嗙粍绫诲瀷 drCode, deptCode, leaveHospitalDistrictCode
+ */
+ @ApiModelProperty(value = "鍒嗙粍绫诲瀷")
+ private String groupKeyType;
+
+ /**
+ * 鍒嗙粍key
+ */
+ @ApiModelProperty(value = "鍒嗙粍key")
+ private String groupKey;
+
+ /**
+ * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+ */
+ @ApiModelProperty(value = "缁熻鏂瑰紡")
+ private String followUpCountStyle;
+
+ /**
+ * 鍒嗙粍code闆嗗悎
+ */
+ @ApiModelProperty(value = "鍒嗙粍code闆嗗悎")
+ private List<String> groupKeyList;
/**
* pageNum
@@ -94,4 +145,4 @@
*/
@ApiModelProperty("pageSize")
private Integer pageSize;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3