From af3ec57db40f80fba5903aaedae5e66bf46a7ed9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 01 七月 2026 10:57:18 +0800
Subject: [PATCH] 【景宁】任务组开发
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index a32a571..7e494bd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -245,10 +245,9 @@
private String sendlimitnend;
/**
- * 鍙戦�佺姸鎬�
+ * 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂
*/
-// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)\") ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂")
private Long sendstate;
/**
@@ -356,6 +355,12 @@
@Excel(name = " 鏈烘瀯ID ")
@ApiModelProperty(value = "鏈烘瀯ID")
private String orgid;
+
+ /**
+ * 闄㈠尯ID
+ */
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
/**
* 鏂囨湰鍙橀噺鍙傛暟
@@ -469,6 +474,13 @@
@Excel(name = " 鍑洪櫌璇婃柇鍚嶇О")
@ApiModelProperty(value = "鍑洪櫌璇婃柇鍚嶇О")
private String leavediagname;
+
+ /**
+ * 鍏ラ櫌璇婃柇鍚嶇О
+ */
+ @Excel(name = " 鍏ラ櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
+ private String diagname;
/**
* 鎮ｈ�匢D
@@ -675,4 +687,65 @@
@ApiModelProperty(value = "鎵嬫湳璁板綍id 瀵瑰簲pat_med_operation_item.id")
private Long operationItemId;
+
+ /**
+ * 鐤剧梾鐥呯
+ */
+ @ApiModelProperty(value = "鐤剧梾鐥呯")
+ @Excel(name = " 鐤剧梾鐥呯")
+ private String diagType;
+
+ /**
+ * 寮�濮嬪嚭闄㈡棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
+ private Date startOutHospTime;
+
+ /**
+ * 缁撴潫鍑洪櫌鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
+ private Date endOutHospTime;
+
+ /**
+ * 寮�濮嬪彂閫佹棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
+ private Date startSendDateTime;
+
+ /**
+ * 缁撴潫鍙戦�佹棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
+ private Date endSendDateTime;
+
+ // ===================== 浠诲姟缁勶紙appltype=5锛夊洖婧瓧娈� =====================
+
+ /**
+ * 鍏宠仈 service_task_schedule.id锛坅ppltype=5 鏃朵娇鐢級
+ */
+ @ApiModelProperty(value = "鍏宠仈 service_task_schedule.id锛坅ppltype=5锛�")
+ private Long scheduleId;
+
+ /**
+ * 鍏宠仈 service_task_schedule_detail.id
+ */
+ @ApiModelProperty(value = "鍏宠仈 service_task_schedule_detail.id")
+ private Long scheduleDetailId;
+
+ /**
+ * 鏈潯 subtask 鍦ㄨ鍒掍腑鐨勯『搴忓彿
+ */
+ @ApiModelProperty(value = "鏈潯 subtask 鍦ㄨ鍒掍腑鐨勯『搴忓彿")
+ private Integer scheduleSeq;
+
+ /**
+ * 鎵�鍦ㄥ惊鐜疆娆★紙闈炲惊鐜换鍔′负0锛�
+ */
+ @ApiModelProperty(value = "鎵�鍦ㄥ惊鐜疆娆★紙闈炲惊鐜换鍔′负0锛�")
+ private Long loopCount;
}
--
Gitblit v1.9.3