From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 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 1a090a7..ce4902a 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
@@ -183,6 +183,37 @@
private String groupKey;
/**
+ * 鐥呭尯缁熻锛堢闄㈢淮搴︼級瀹為檯浣跨敤鐨勨�滄湁鏁堢梾鍖衡�濆垪琛ㄨ揪寮忥紙浠呮湇鍔＄鍐呴儴浣跨敤锛夈��
+ * <p>
+ * 婊℃剰搴﹀瓙浠诲姟锛坰ervice_type 6/14/15/16锛夌殑 {@code leavehospitaldistrictcode} 绾︿笁鎴愪负绌猴紝
+ * 鏃у啓娉曟妸绌哄�煎綋鎴愨�滀笉闄愨�濇斁琛岋紙{@code xxx IS NULL OR xxx IN (...)}锛夛紝
+ * 缁撴灉閫変腑 A 鐥呭尯鏃朵細鎶婄┖鐥呭尯鐨勮褰曞叏甯﹁繘鏉ワ紝鍐嶆寜
+ * {@code IFNULL(leavehospitaldistrictcode,'Unknown')} 褰掓垚涓�涓粍锛�
+ * 杩欎竴缁勭殑鐥呭尯鍚嶅張鏄� {@code MAX(hospitaldistrictname)} 闅忎究鎸戠殑銆�
+ * <p>
+ * 杩欓噷缁欏嚭鈥滃嚭闄㈢梾鍖轰负绌哄垯鍥為��鍒板湪闄㈢梾鍖衡�濈殑琛ㄨ揪寮忥紝杩囨护涓庡垎缁勯兘鏀圭敤瀹冿紝
+ * 绌虹梾鍖虹殑璁板綍鍥犳鍥炲埌瀹冪湡姝ｇ殑鍦ㄩ櫌鐥呭尯锛岃�屼笉鏄薄鏌撶敤鎴烽�変腑鐨勭梾鍖恒��
+ * 涓� null 鏃朵繚鎸佸巻鍙茶涓猴紙鍏煎鍏跺畠璋冪敤鏂癸級銆�
+ */
+ @JsonIgnore
+ private String districtColumn;
+
+ /**
+ * 鍒嗛〉鍋忕Щ閲忥紙浠呮湇鍔＄鍐呴儴浣跨敤锛夈��
+ * <p>
+ * pageNum 鏄� 1 璧峰鐨勶紝鑰屽巻鍙插啓娉曠洿鎺ユ妸瀹冨綋 SQL 鐨� OFFSET 鐢�
+ * 锛坽@code limit 20 OFFSET 1}锛夛紝绗竴椤典細鍑┖璺虫帀绗竴鏉″垎缁勬暟鎹��
+ */
+ @JsonIgnore
+ public Integer getPageOffset() {
+ if (pageSize == null) {
+ return null;
+ }
+ int current = (pageNum == null || pageNum < 1) ? 1 : pageNum;
+ return (current - 1) * pageSize;
+ }
+
+ /**
* 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
*/
@ApiModelProperty(value = "缁熻鏂瑰紡")
@@ -205,6 +236,18 @@
*/
@ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
private String excep;
+
+ /**
+ * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+ private String suggest;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝ｅ父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+ private Long finishState;
/**
* 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
@@ -266,6 +309,12 @@
private String hospType;
/**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
--
Gitblit v1.9.3