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/VO/ServiceSubtaskVO.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
index 840f7e3..df98fd7 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
@@ -79,10 +79,10 @@
private String senduuid;
/**
- * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID銆�6鍥為櫌澶嶈瘖澶嶆煡
*/
- @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
- @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡")
private String suggest;
/**
@@ -476,6 +476,12 @@
@ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
+ /**
+ * 褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧
+ */
+ @ApiModelProperty(value = "褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧")
+ private String currentPreachforms;
+
/**
* 搴婂彿
@@ -651,6 +657,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
@@ -698,6 +710,24 @@
*/
@ApiModelProperty(value = "缁忕鍖荤敓")
private String managementDoctor;
+
+ /**
+ * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛�<b>妯＄硦鏌ヨ</b>锛夛細`/patItem`銆乣/patItemCount`銆�
+ * `/patItemExport` 鐨勮姹備綋瀛楁銆�
+ * <p>
+ * 瀵瑰簲 {@code service_subtask.importance_flag_code}锛堝缓浠诲姟鏃朵粠
+ * {@code pat_med_inhosp.importance_flag_code} 鍚屾锛夛紝搴撻噷瀛樼殑鏄噰闆嗘嫾鍑虹殑鎻忚堪涓诧細
+ * 銆屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶃�屾棤銆嶃�岀壒绾︿汉鍛樸�嶃�岀浼戜汉鍛樸�嶏紝澶氬�肩敤鑻辨枃閫楀彿鎷兼帴锛堝銆屾棤,鏃ラ棿鎵嬫湳銆嶏級锛�
+ * 涔熷彲鑳藉瓨鏋氫妇缂栫爜 {@code FH0165.01} / {@code FH0165.02}銆�
+ * <p>
+ * 鍥犱负鏄� {@code LIKE '%鍊�%'}锛氫紶銆屾棩闂淬�嶅彲涓�娆″懡涓棩闂存墜鏈� + 鏃ラ棿璇婄枟 + 澶氬�艰锛�
+ * 浼犲畬鏁村�硷紙濡傘�屾棩闂存墜鏈�嶆垨 {@code FH0165.01}锛夊垯閫�鍖栦负绮剧‘鍖归厤銆�
+ * <p>
+ * 鈿狅笍 鍊肩粡 {@code DtoConversionUtils.sourceToTarget} 鍚屽悕鎷疯礉鍒� {@code ServiceSubtaskEntity}锛�
+ * 鎵�浠ユ湰绫诲瓧娈靛悕蹇呴』涓庡疄浣撲竴鑷达紝鍚﹀垯鍙傛暟浼氳闈欓粯涓㈠純銆�
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侊紙妯＄硦鍖归厤锛屽 鏃ラ棿 / 鏃ラ棿鎵嬫湳 / FH0165.01锛�")
+ private String importanceFlagCode;
/**
* 寮�濮嬪嚭闄㈡棩鏈�
@@ -819,6 +849,36 @@
@ApiModelProperty(value = "椤甸潰灞曠ず鐘舵�� 锛�1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級")
private Long sendstateView;
+ /**
+ * 鏄惁鍗冲皢瓒呮椂锛�1 鏄紙閰嶅悎 soonTimeoutHours 浣跨敤锛岀敤浜庢煡璇㈠嵆灏嗚秴鏃跺垪琛級
+ */
+ @ApiModelProperty(value = "鏄惁鍗冲皢瓒呮椂:1鏄�")
+ private Integer soonTimeout;
+
+ /**
+ * 鍗冲皢瓒呮椂鏃堕棿锛堝皬鏃讹級锛氭埅姝㈡椂闂村湪 N 灏忔椂鍐�
+ */
+ @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
+ private Integer soonTimeoutHours;
+
+ /**
+ * 鐐逛綅缂栫爜闆嗗悎锛�2026-11 鏂板锛�<b>鐐逛綅鏌ヨ鏉′欢鐨勫敮涓�鍏ュ弬</b>锛夈��
+ * <p>
+ * 鍓嶇鍙紶杩欎釜瀛楁锛�<b>鍗曢�変篃浼犳暟缁�</b>锛�
+ * <ul>
+ * <li>鍗曢�夛細{@code {"pointLocations": ["P001"]}}</li>
+ * <li>澶氶�夛細{@code {"pointLocations": ["P001","P002"]}}</li>
+ * <li>涓嶇瓫鐐逛綅锛氫笉浼犳垨浼� {@code []}</li>
+ * </ul>
+ * 鈫� SQL 缁熶竴璧� {@code point_location IN (...)}锛堣 {@code serviceSubtaskWhere} /
+ * {@code countByCondition}锛夛紝鍒楄〃涓� total 鐢ㄥ悓涓�鏉′欢銆�
+ * <p>
+ * 鈿狅笍 鍊肩粡 {@code DtoConversionUtils.sourceToTarget} 鍚屽悕鎷疯礉鍒� {@code ServiceSubtaskEntity}锛�
+ * 鎵�浠ユ湰绫诲瓧娈靛悕蹇呴』涓庡疄浣撲竴鑷达紝鍚﹀垯鍙傛暟浼氳闈欓粯涓㈠純銆�
+ */
+ @ApiModelProperty(value = "鐐逛綅缂栫爜闆嗗悎")
+ private List<String> pointLocations;
+
// /**
// * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
// */
--
Gitblit v1.9.3