From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1,患者过滤状态修改(之前只支持发送之前的过滤,现在支持发送之后的过滤,如果任务发送后,外链不能再打开) 2.在出入院表新增入院申请单字段 3.采集入院数据时,同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送,也要查询子任务状态,如果是不执行,也不能再发送
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 147b291..dcee2ce 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -357,6 +357,12 @@
private String orgid;
/**
+ * 闄㈠尯ID
+ */
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /**
* 鏂囨湰鍙橀噺鍙傛暟
*/
@Excel(name = "鏂囨湰鍙橀噺鍙傛暟")
@@ -445,7 +451,7 @@
* 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
*/
@Excel(name = " 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
- @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴锛�")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴銆�8鎵爜锛�")
private String hospType;
@@ -468,6 +474,13 @@
@Excel(name = " 鍑洪櫌璇婃柇鍚嶇О")
@ApiModelProperty(value = "鍑洪櫌璇婃柇鍚嶇О")
private String leavediagname;
+
+ /**
+ * 鍏ラ櫌璇婃柇鍚嶇О
+ */
+ @Excel(name = " 鍏ラ櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
+ private String diagname;
/**
* 鎮h�匢D
@@ -674,4 +687,39 @@
@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;
}
--
Gitblit v1.9.3