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/ServiceSubtask.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtask.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtask.java
index c00bd91..9cf60da 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtask.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtask.java
@@ -179,11 +179,18 @@
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;
+
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @Excel(name = "鍖荤敓澶勭悊鎰忚")
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
/**
* 鍙戦�佹棩鏈�
@@ -276,6 +283,12 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚")
+ private Long finishState;
/**
* 灏辫瘖璁板綍缂栧彿
@@ -695,6 +708,25 @@
private String diagType;
/**
+ * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛�<b>寤轰换鍔℃椂浠� {@code pat_med_inhosp.importance_flag_code} 鍚屾</b>锛夈��
+ * <p>
+ * 涓轰粈涔堝悓姝ワ細鍒ゆ柇銆屾棩闂淬�嶅氨鐪嬭繖涓瓧娈碉紝鑰� service_subtask 涓婂彧鏈� {@code inhospid}锛�
+ * 涓嶈惤涓�浠界殑璇濇寜銆屾棩闂淬�嶇瓫瀛愪换鍔℃瘡琛岄兘瑕佸洖鏌ヤ綇闄㈢櫥璁拌〃锛圝OIN / 瀛愭煡璇級锛屽垪琛ㄤ笌缁熻閮藉彉鎱€��
+ * <p>
+ * 鍙栧�兼槸<b>鍘熸牱鎷疯礉</b>锛屼笉鍦ㄦ湰琛ㄥ仛褰掍竴锛�
+ * <ul>
+ * <li>鏋氫妇缂栫爜鍙ｅ緞锛坽@code ImportFlagEnum}锛夛細{@code FH0165.01} 鏃ラ棿鎵嬫湳銆亄@code FH0165.02} 鏃ラ棿璇婄枟銆�
+ * {@code FH0165.03} 鏃犮�亄@code FH0165.98} 鐗圭害浜哄憳銆亄@code FH0165.99} 绂讳紤浜哄憳锛�</li>
+ * <li>鐜板満涔熸湁瀛�<b>涓枃鎻忚堪</b>鐨勫簱锛堛�屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶁�︼級锛岃繕瀛樺湪閫楀彿澶氬�硷紙濡� {@code 鏃�,鏃ラ棿鎵嬫湳}锛夈��</li>
+ * </ul>
+ * 鎵�浠ユ煡璇晶鎻愪緵銆岀簿纭�笺�嶅拰銆岄泦鍚� IN銆嶄袱绉嶆潯浠讹紝瑙� {@code serviceSubtaskWhere}銆�
+ * <p>
+ * 鈿狅笍 杩欐槸<b>寤轰换鍔￠偅涓�鍒荤殑蹇収</b>锛氫箣鍚庝綇闄㈣褰曟敼浜嗘爣璁帮紝涓嶄細鑷姩鍥炲啓宸叉湁瀛愪换鍔°��
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侊紙鏃ラ棿鎵嬫湳/鏃ラ棿璇婄枟/鏃�/鐗圭害浜哄憳/绂讳紤浜哄憳锛屾垨 FH0165.xx锛�")
+ private String importanceFlagCode;
+
+ /**
* 寮�濮嬪嚭闄㈡棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -754,4 +786,10 @@
@Excel(name = " 浜哄伐鐢佃瘽鏍囪 ")
@ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
private Long isManuallyCalled;
+
+ /**
+ * 鍐嶆闅忚鏂瑰紡锛堜粎鎺ュ彛璇锋眰鍙傛暟锛屼笉钀藉簱锛�
+ */
+ @ApiModelProperty(value = "鍐嶆闅忚鏂瑰紡 1-鏈瀹ら殢璁� 2-闅忚涓績闅忚锛堜粎璇锋眰鍙傛暟锛屼笉钀藉簱锛�")
+ private String resource;
}
--
Gitblit v1.9.3