From 18f876d637cf1e9b0b264a4586e4a676a21f8166 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 十一月 2026 10:30:46 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
index a71dadc..1fdb1ad 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
@@ -11,7 +11,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-
import com.ruoyi.task.domain.TaskSendTimeVO;
/**
@@ -732,6 +731,78 @@
private String managementDoctor;
/**
+ * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛�<b>鏌ヨ鏉′欢</b>锛夛細绮剧‘鍖归厤銆�
+ * <p>
+ * 瀵瑰簲 {@code service_subtask.importance_flag_code}锛氬缓浠诲姟鏃朵粠
+ * {@code pat_med_inhosp.importance_flag_code} 鍘熸牱鍚屾銆�
+ * 鏋氫妇瑙� {@code com.ruoyi.common.enums.ImportFlagEnum}
+ * 锛坽@code FH0165.01} 鏃ラ棿鎵嬫湳銆亄@code FH0165.02} 鏃ラ棿璇婄枟鈥︼級锛�
+ * 鐜板満搴撲篃鍙兘瀛樹腑鏂囨弿杩般��
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侊紙绮剧‘鍖归厤锛屽 FH0165.01 / 鏃ラ棿鎵嬫湳锛�")
+ private String importanceFlagCode;
+
+ /**
+ * 閲嶈鎬ф爣璁扮紪鐮侀泦鍚堬紙鏌ヨ鏉′欢锛夛細{@code IN} 鍖归厤锛岀敤浜庛�屾棩闂淬�嶈繖绫�
+ * 銆岃鍚屾椂鍛戒腑澶氫釜鍙栧�笺�嶇殑鍦烘櫙銆�
+ * <p>
+ * 渚嬶細鍙湅鏃ラ棿 鈫� {@code ["鏃ラ棿鎵嬫湳","鏃ラ棿璇婄枟"]}锛堜腑鏂囨弿杩板彛寰勶級鎴�
+ * {@code ["FH0165.01","FH0165.02"]}锛堟灇涓剧紪鐮佸彛寰勶級銆�
+ * <p>
+ * 鈿狅笍 绛夊��/IN 閮藉尮閰嶄笉鍒伴�楀彿澶氬�硷紙濡� {@code 鏃�,鏃ラ棿鎵嬫湳}锛夛紱杩欑被鏁版嵁鏋佸皯锛�
+ * 闇�瑕佹椂璇风敤 {@code find_in_set} 鍗曠嫭鍐� SQL锛屽埆鎶婅涔夊杩涜繖涓瓧娈点��
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侀泦鍚堬紙IN 鍖归厤锛岀敤浜庝竴娆＄瓫澶氫釜鏍囪锛�")
+ private List<String> importanceFlagCodes;
+
+ /**
+ * 鐐逛綅缂栫爜锛�2026-11 鏂板锛屽搴� {@code service_subtask.point_location}锛夈��
+ * <p>
+ * 鈿狅笍 <b>鍓嶇涓嶄紶杩欎釜瀛楁</b>锛堝彧浼� {@link #pointLocations} 鏁扮粍锛夈�傝繖閲屼繚鐣欏畠鏈変袱涓師鍥狅細
+ * <ol>
+ * <li>瀹冩槸 {@code service_subtask} 鐨勫垪璇箟杞戒綋锛屼笌鍏跺畠鍗曞�兼煡璇㈠瓧娈典繚鎸佸绉帮紱</li>
+ * <li>鍏滃簳锛氱洿鎺ヨ皟 {@code /countByCondition} 涔嬬被鎺ュ彛鐨勮�佽皟鐢ㄦ柟锛岃嫢浠嶄紶鍗曞��
+ * 锛堟垨 {@code "P001,P002"} 閫楀彿涓诧級锛寋@link #getPointLocations()} 浼氭妸瀹冩媶鎴愰泦鍚堬紝
+ * 缁熶竴璧� {@code IN}锛屼笉浼氳闈欓粯蹇界暐銆�</li>
+ * </ol>
+ */
+ @ApiModelProperty(value = "鐐逛綅缂栫爜锛堝墠绔笉浼狅紱浠呭吋瀹瑰崟鍊煎叆鍙傜殑鍏滃簳锛�")
+ private String pointLocation;
+
+ /**
+ * 鐐逛綅缂栫爜闆嗗悎锛�2026-11 鏂板锛�<b>鐐逛綅鏌ヨ鏉′欢鐨勫敮涓�鍏ュ弬</b>锛夛細{@code IN} 鍖归厤銆�
+ * <p>
+ * 鍓嶇鍗曢�変篃浼犳暟缁勶細{@code ["P001"]} / 澶氶�� {@code ["P001","P002"]}锛涗笉绛涘垯浼� {@code []} 鎴栦笉浼犮��
+ */
+ @ApiModelProperty(value = "鐐逛綅缂栫爜闆嗗悎锛圛N 鍖归厤锛涘崟閫変篃浼犳暟缁勶級")
+ private List<String> pointLocations;
+
+ /**
+ * 鐐逛綅鏌ヨ鏉′欢鐨�<b>鍞竴鍏ュ彛</b>锛歋QL 閲屽彧鏈変竴鏉� {@code point_location IN (...)}锛�
+ * 鍗曢��/澶氶�夐兘鍦ㄨ繖閲屽綊涓�锛岄伩鍏嶅嚭鐜般�屽彧浼� pointLocation 鏃剁瓫閫夎闈欓粯蹇界暐銆嶃��
+ * <p>
+ * 鎵嬪啓杩欎釜 getter锛坽@code @Data} 涓嶄細閲嶅鐢熸垚锛夋槸涓轰簡璁� MyBatis 鐨� OGNL
+ * 锛坽@code pointLocations.size() > 0} 涓� {@code foreach collection="pointLocations"}锛�
+ * 鍙栧埌鍚堝苟鍚庣殑闆嗗悎銆�
+ */
+ public List<String> getPointLocations() {
+ if (pointLocations != null && !pointLocations.isEmpty()) {
+ return pointLocations;
+ }
+ if (pointLocation != null && !pointLocation.trim().isEmpty()) {
+ // 鍏煎鏈粨搴撱�屽閫�=閫楀彿涓层�嶇殑鑰佸彛寰勶細鍓嶇鑻ユ妸澶氶�夊杩涘崟鍊煎瓧娈碉紙P001,P002锛変篃鑳藉懡涓�
+ List<String> split = new java.util.ArrayList<>();
+ for (String item : pointLocation.split(",")) {
+ if (!item.trim().isEmpty()) {
+ split.add(item.trim());
+ }
+ }
+ return split.isEmpty() ? null : split;
+ }
+ return pointLocations;
+ }
+
+ /**
* 寮�濮嬪嚭闄㈡棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3