From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java | 94 +++++++++++++++++++++++++++++++++--------------
1 files changed, 66 insertions(+), 28 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 7b833ac..a71dadc 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
@@ -11,6 +11,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+
import com.ruoyi.task.domain.TaskSendTimeVO;
/**
@@ -84,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;
/**
@@ -112,6 +113,18 @@
*/
@ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer rateDay;
+
+ /**
+ * 鏄惁鍗冲皢瓒呮椂锛�1 鏄紙閰嶅悎 soonTimeoutHours 浣跨敤锛�
+ */
+ @ApiModelProperty(value = "鏄惁鍗冲皢瓒呮椂:1鏄�")
+ private Integer soonTimeout;
+
+ /**
+ * 鍗冲皢瓒呮椂鏃堕棿锛堝皬鏃讹級锛氱粺璁¤窛瓒呮椂鎴鏃堕棿鍦� N 灏忔椂鍐呯殑寰呴殢璁挎暟閲�
+ */
+ @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
+ private Integer soonTimeoutHours;
/**
* 鎬у埆
@@ -236,32 +249,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;
/**
* 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -359,17 +372,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闆嗗悎")
+ private List<String> leaveldeptcodes;
+
/**
* 閮ㄩ棬code
*/
@Excel(name = " 閮ㄩ棬code")
@ApiModelProperty(value = "閮ㄩ棬code闆嗗悎")
- private List<String> leaveldeptcodes;
+ private List<String> deptcodes;
/**
* 鏍囩鐘舵��
@@ -476,6 +496,12 @@
@ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
+ /**
+ * 褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧
+ */
+ @ApiModelProperty(value = "褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧")
+ private String currentPreachforms;
+
/**
* 搴婂彿
@@ -557,11 +583,11 @@
private String diagname;
/**
- * 绉戝鍚嶇О
+ * 鍑洪櫌绉戝鍚嶇О锛堝師 deptname 鍒楋紝宸叉敼鍚� leaveldeptname锛�
*/
- @Excel(name = "绉戝鍚嶇О")
- @ApiModelProperty(value = "绉戝鍚嶇О")
- private String deptname;
+ @Excel(name = "鍑洪櫌绉戝鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ private String leaveldeptname;
//
// /**
// * 灏辫瘖鏃ユ湡
@@ -605,6 +631,12 @@
private List<String> leavehospitaldistrictcodes;
/**
+ * 鍦ㄩ櫌鐥呭尯闆嗗悎锛堝搴� hospitaldistrictcode 鍒楋紝2026-11 涓� VO 瀵归綈鍚庤ˉ涓婏級
+ */
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯闆嗗悎")
+ private List<String> hospitaldistrictcodes;
+
+ /**
* 鍑洪櫌鐥呭尯鍚嶇О
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
@@ -645,6 +677,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
--
Gitblit v1.9.3