From b46b8b8fee4d10e52dd882febc07974b02e2aed9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:14:18 +0800
Subject: [PATCH] 本地测试前提交：跨模块收口相关源码改动
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
index e0f31f1..d840716 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
@@ -1,5 +1,6 @@
package com.ruoyi.task.domain;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -85,6 +86,18 @@
@ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
@Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
private String deptname;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯缂栧彿")
+ private String hospitaldistrictcode;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝缂栧彿")
+ private String hospitaldeptcode;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝鍚嶇О")
+ private String hospitaldeptname;
@ApiModelProperty(value = "鍑洪櫌浜烘")
@Excel(name = " 鍑洪櫌浜烘 ")
@@ -353,4 +366,39 @@
@ApiModelProperty(value = "杩囨护鎮ｈ�呰鎯�")
private List<ServiceSubtask> filterCountList;
+ /**
+ * 鍒嗙粍閿�硷紙drcode / leaveldeptcode / leavehospitaldistrictcode 鐨勫疄闄呭彇鍊硷級銆�
+ * <p>
+ * 浠呮湇鍔＄鍐呴儴浣跨敤锛氱粺璁℃敼鎴愭暟鎹簱 GROUP BY 涔嬪悗锛屽強鏃剁巼銆佹弧鎰忓害棰樼洰閲忛兘鏄彟涓�鏉�
+ * 鎸夊悓涓�鍒嗙粍閿仛鍚堢殑 SQL锛岃繖閲岀敤瀹冩妸涓ら儴鍒嗙粨鏋滃璧锋潵銆�
+ * 鐢� @JsonIgnore 淇濊瘉涓嶄細澶氳繑鍥炲瓧娈电粰鍓嶇锛屼篃涓嶅奖鍝� @Cacheable 鐨� Redis 搴忓垪鍖栥��
+ */
+ @JsonIgnore
+ private String groupCode;
+
+ /**
+ * 鍒嗙粍閿搴旂殑鏄剧ず鍚嶏紙鐥呭尯缁熻鏃跺嵆璇ョ粍鐨勭梾鍖哄悕锛夈��
+ * <p>
+ * 浠呮湇鍔＄鍐呴儴浣跨敤锛氬師鏉ョ梾鍖哄垪鍙栫殑鏄� {@code MAX(hospitaldistrictname)}锛�
+ * 涓�涓粍閲屾贩浜嗗涓梾鍖烘椂灏变細闅忔満鏄剧ず鍏朵腑涓�涓紙閫夎娑插唴绉戠梾鍖哄嵈鏄剧ず鈥滈绉戜腑蹇冧笁鐥呭尯鈥濓級銆�
+ * 鏀规垚鎸夊垎缁勯敭鍙栧悕瀛楋紝鍐嶅洖濉埌鐥呭尯 code/name 瀛楁銆�
+ */
+ @JsonIgnore
+ private String groupName;
+
+ /**
+ * 棣栨闅忚璁板綍鏁帮紙visit_count = 1 鐨勮鏁帮級銆�
+ * <p>
+ * 浠呮湇鍔＄鍐呴儴浣跨敤锛氬師鍐呭瓨缁熻閲屸�滈娆￠殢璁跨巼鈥濆彧鍦ㄨ鍒嗙粍瀛樺湪棣栨闅忚璁板綍鏃舵墠浼氳璧嬪��
+ * 锛堜笉瀛樺湪鍒欐槸 null 鑰屼笉鏄� 0.00%锛夛紝杩欓噷鐢ㄥ畠澶嶅埢杩欎釜鍙ｅ緞銆�
+ */
+ @JsonIgnore
+ private Long firstVisitCount;
+
+ /**
+ * 鍐嶆闅忚璁板綍鏁帮紙visit_count > 1 鐨勮鏁帮級銆備粎鏈嶅姟绔唴閮ㄤ娇鐢紝鐢ㄩ�斿悓涓娿��
+ */
+ @JsonIgnore
+ private Long againVisitCount;
+
}
--
Gitblit v1.9.3