From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
index 5ce66dd..1a090a7 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
@@ -61,11 +61,20 @@
@ApiModelProperty(value = "鏈嶅姟绫诲瀷")
private List<Long> serviceType;
- @ApiModelProperty(value = "鐥呭尯Code闆嗗悎")
+ @ApiModelProperty(value = "绂婚櫌鐥呭尯Code闆嗗悎")
private List<String> leavehospitaldistrictcodes;
+
+ @ApiModelProperty(value = "绂婚櫌绉戝Code闆嗗悎")
+ private List<String> leaveldeptcodes;
@ApiModelProperty(value = "绉戝Code闆嗗悎")
private List<String> deptcodes;
+
+ @ApiModelProperty(value = "鐥呭尯Code闆嗗悎")
+ private List<String> hospitaldistrictcodes;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝Code闆嗗悎")
+ private List<String> hospitaldeptcodes;
@ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
private List<Long> subTaskIds;
@@ -157,6 +166,17 @@
private String groupKeyType;
/**
+ * 瀹為檯鐢ㄤ簬鈥滅粨鏋滃垎缁勨�濈殑鍒楀悕锛堜粎鏈嶅姟绔唴閮ㄤ娇鐢紝涓嶄粠璇锋眰浼犲叆锛夈��
+ * <p>
+ * 鍘嗗彶鍘熷洜锛歿@link #groupKey} 鏃㈢敤浜� getSfStatistics 鐨� {@code AND ${groupKey} IN (...)} 杩囨护锛�
+ * 鍙堣褰撴垚鍒嗙粍鍒楋紱浣� {@code groupKey = 'deptcode'} 鏃讹紝鍘熷疄鐜版槸鍦ㄥ唴瀛橀噷鎸�
+ * {@code leaveldeptcode} 鍒嗙粍鐨勶紝杩囨护鍒椾笌鍒嗙粍鍒楀苟涓嶇浉鍚屻��
+ * 涓轰簡鎶婄疮鍔犱笅鎺ㄥ埌鏁版嵁搴撳悗鍙ｅ緞涓嶅彉锛岃繖閲屾妸涓や欢浜嬫媶寮�锛歡roupKey 璐熻矗杩囨护锛実roupColumn 璐熻矗鍒嗙粍銆�
+ */
+ @JsonIgnore
+ private String groupColumn;
+
+ /**
* 鍒嗙粍key
*/
@ApiModelProperty(value = "鍒嗙粍key")
--
Gitblit v1.9.3