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/ServiceSubtaskRes.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskRes.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskRes.java
index d65bf63..0e0cf34 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskRes.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskRes.java
@@ -62,6 +62,12 @@
private String remark;
/**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
+ /**
* 澶囨敞
*/
@ApiModelProperty(value = "")
@@ -186,10 +192,10 @@
private String templatename;
/**
- * 鍙戝鐞嗘剰瑙侊細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;
/**
@@ -235,6 +241,17 @@
@Excel(name = " 鍦ㄩ櫌绉戝鍚嶇О ")
@ApiModelProperty(value = "绉戝鍚嶇О锛堝叆闄㈢淮搴︼級")
private String deptname;
+
+ /**
+ * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛夛細寤轰换鍔℃椂浠� {@code pat_med_inhosp.importance_flag_code} 鍚屾锛�
+ * 鍒楄〃鎺ュ彛鍘熸牱杩斿洖銆�
+ * <p>
+ * 鍒ゆ柇銆屾棩闂淬�嶇湅杩欓噷锛歿@code ImportFlagEnum} 鐨� {@code FH0165.01}锛堟棩闂存墜鏈級/
+ * {@code FH0165.02}锛堟棩闂磋瘖鐤楋級锛涚幇鍦哄簱瀛樼殑鏄腑鏂囨弿杩般�屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶏紝
+ * 杩樺彲鑳藉嚭鐜� {@code 鏃�,鏃ラ棿鎵嬫湳} 杩欑被澶氬�� 鈥斺�� 鎵�浠ュ墠绔埆鐢ㄧ瓑鍊煎垽鏂紝鎸夈�屽寘鍚�嶅尮閰嶃��
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侊紙鏃ラ棿鎵嬫湳/鏃ラ棿璇婄枟/鏃�/鐗圭害浜哄憳/绂讳紤浜哄憳锛�")
+ private String importanceFlagCode;
/**
* 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -293,6 +310,12 @@
private Date finishtime;
/**
+ * 瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚")
+ private Long finishState;
+
+ /**
* 灏辫瘖璁板綍缂栧彿
*/
@Excel(name = " 灏辫瘖璁板綍缂栧彿 ")
--
Gitblit v1.9.3