From 6a069cd871bf0b53768fc9a76a397af709c1deec Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 17:05:55 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 32 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 3295b8a..2e0d624 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;
/**
@@ -93,10 +93,10 @@
private String phone;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)
*/
- @Excel(name = "鏈嶅姟绫诲瀷(鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁�)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁� 19鎵嬫湳闅忚 20 鎮ｈ�呭紓甯告姤鍛婅〃)")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
private String serviceType;
/**
@@ -223,32 +223,32 @@
private Date senddate;
/**
- * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌鐥呭尯缂栫爜锛堝師 sendlimitabegin 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
- private String sendlimitabegin;
+ @Excel(name = " 鍦ㄩ櫌鐥呭尯缂栫爜 ")
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯缂栫爜")
+ private String hospitaldistrictcode;
/**
- * 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌鐥呭尯鍚嶇О锛堝師 sendlimitaend 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
- private String sendlimitaend;
+ @Excel(name = " 鍦ㄩ櫌鐥呭尯鍚嶇О ")
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
/**
- * 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌绉戝缂栫爜锛堝師 sendlimitpbegin 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
- private String sendlimitpbegin;
+ @Excel(name = " 鍦ㄩ櫌绉戝缂栫爜 ")
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝缂栫爜")
+ private String deptcode;
/**
- * 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌绉戝鍚嶇О锛堝師 sendlimitpend 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
- private String sendlimitpend;
+ @Excel(name = " 鍦ㄩ櫌绉戝鍚嶇О ")
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝鍚嶇О")
+ private String deptname;
/**
* 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -351,17 +351,24 @@
private Long bhsms;
/**
- * 閮ㄩ棬code
+ * 鍑洪櫌绉戝缂栫爜锛堝師 deptcode 鍒楋紝宸叉敼鍚� leaveldeptcode锛�
*/
- @Excel(name = " 閮ㄩ棬code")
- @ApiModelProperty(value = "閮ㄩ棬code")
- private String deptcode;
+ @Excel(name = " 鍑洪櫌绉戝缂栫爜")
+ @ApiModelProperty(value = "鍑洪櫌绉戝缂栫爜")
+ private String leaveldeptcode;
/**
* 閮ㄩ棬code
*/
@Excel(name = " 閮ㄩ棬code")
- @ApiModelProperty(value = "閮ㄩ棬code闆嗗悎")
+ @ApiModelProperty(value = "绂婚櫌閮ㄩ棬code闆嗗悎")
private List<String> leaveldeptcodes;
+
+ /**
+ * 鍦ㄩ櫌閮ㄩ棬code
+ */
+ @Excel(name = "鍦ㄩ櫌閮ㄩ棬code")
+ @ApiModelProperty(value = "鍦ㄩ櫌閮ㄩ棬code")
+ private List<String> deptcodes;
/**
* 鏍囩鐘舵��
@@ -469,6 +476,12 @@
@ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
+ /**
+ * 褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧
+ */
+ @ApiModelProperty(value = "褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧")
+ private String currentPreachforms;
+
/**
* 搴婂彿
@@ -550,11 +563,12 @@
private String diagname;
/**
- * 绉戝鍚嶇О
+ * 鍑洪櫌绉戝鍚嶇О锛堝師 deptname 鍒楋紝宸叉敼鍚� leaveldeptname锛�
*/
- @Excel(name = "绉戝鍚嶇О")
- @ApiModelProperty(value = "绉戝鍚嶇О")
- private String deptname;
+ @Excel(name = "鍑洪櫌绉戝鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ private String leaveldeptname;
+
//
// /**
// * 灏辫瘖鏃ユ湡
@@ -590,12 +604,17 @@
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
private String leavehospitaldistrictcode;
-
/**
* 鍑洪櫌鐥呭尯缂栧彿
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯闆嗗悎")
private List<String> leavehospitaldistrictcodes;
+
+ /**
+ * 鍦ㄩ櫌鐥呭尯闆嗗悎
+ */
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯闆嗗悎")
+ private List<String> hospitaldistrictcodes;
/**
* 鍑洪櫌鐥呭尯鍚嶇О
@@ -637,6 +656,12 @@
*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
/**
@@ -806,6 +831,18 @@
@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;
+
// /**
// * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
// */
--
Gitblit v1.9.3