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/ServiceSubtaskDetailTrace.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
index 176d723..1f1ae20 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
@@ -2,6 +2,7 @@
import java.util.Date;
+import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -205,6 +206,12 @@
*/
@ApiModelProperty("鍖呭惈鎮ｈ�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
@Excel(name = "鍖呭惈鎮ｈ�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
+ private JSONObject patdescJson;
+ /**
+ * 鍖呭惈鎮ｈ�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑
+ */
+ @ApiModelProperty("鍖呭惈鎮ｈ�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
+ @Excel(name = "鍖呭惈鎮ｈ�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
private String patdesc;
/**
@@ -239,7 +246,7 @@
* 澶勭悊璇︾粏璇存槑锛堝鐞嗙瀹わ級
*/
@ApiModelProperty("澶勭悊璇︾粏璇存槑锛堝鐞嗙瀹わ級")
- @Excel(name = "澶勭悊璇︾粏璇存槑", readConverterExp = "澶�=鐞嗙瀹�")
+ @Excel(name = "澶勭悊璇︾粏璇存槑", readConverterExp = "澶勭悊绉戝")
private String handledesc;
/**
@@ -341,5 +348,35 @@
@Excel(name = "绫诲埆ID")
private Long categoryid;
+ /**
+ * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+ */
+ @ApiModelProperty("婊℃剰搴︽剰瑙佸紓甯革紙鍙拡瀵规枃鏈級")
+ private String isMydException;
+
+ /**
+ * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+ */
+ @ApiModelProperty("闂缁村害")
+ private String dimension;
+
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonName;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonCode;
+
+ @Excel(name = "鎶ュ绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptPersonName;
+
+ @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String reportDeptPersonCode;
+
+
}
--
Gitblit v1.9.3