From b5d55e1dd793c01f08786f805f01345bca64c893 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 09:58:44 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 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..1dc4a6a 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>
+     * 杩欓噷缁欏嚭鈥滃嚭闄㈢梾鍖轰负绌哄垯鍥為��鍒板湪闄㈢梾鍖衡�濈殑琛ㄨ揪寮忥紝杩囨护涓庡垎缁勯兘鏀圭敤瀹冿紝
+     * 绌虹梾鍖虹殑璁板綍鍥犳鍥炲埌瀹冪湡姝g殑鍦ㄩ櫌鐥呭尯锛岃�屼笉鏄薄鏌撶敤鎴烽�変腑鐨勭梾鍖恒��
+     * 涓� 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 = "缁熻鏂瑰紡")

--
Gitblit v1.9.3