From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 881db8f..ad6ad32 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
@@ -85,10 +85,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;
/**
@@ -113,6 +113,18 @@
*/
@ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer rateDay;
+
+ /**
+ * 鏄惁鍗冲皢瓒呮椂锛�1 鏄紙閰嶅悎 soonTimeoutHours 浣跨敤锛�
+ */
+ @ApiModelProperty(value = "鏄惁鍗冲皢瓒呮椂:1鏄�")
+ private Integer soonTimeout;
+
+ /**
+ * 鍗冲皢瓒呮椂鏃堕棿锛堝皬鏃讹級锛氱粺璁¤窛瓒呮椂鎴鏃堕棿鍦� N 灏忔椂鍐呯殑寰呴殢璁挎暟閲�
+ */
+ @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
+ private Integer soonTimeoutHours;
/**
* 鎬у埆
@@ -484,6 +496,12 @@
@ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
+ /**
+ * 褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧
+ */
+ @ApiModelProperty(value = "褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧")
+ private String currentPreachforms;
+
/**
* 搴婂彿
@@ -659,6 +677,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
@@ -708,6 +732,31 @@
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;
+
+ /**
* 寮�濮嬪嚭闄㈡棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3