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/SvyTaskTemplateScript.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
index 77f29c6..e0724c2 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
@@ -85,9 +85,15 @@
     /**
      * 绫诲埆鍚�
      */
-    @ApiModelProperty(value = "绫诲埆鍚�")
+    @ApiModelProperty(value = "瀵瑰簲鐨勬槸svy_lib_script_category鐨勭被鍒悕")
     private String categoryName;
 
+    /**
+     * 绫诲埆ID
+     */
+    @Excel(name = "瀵瑰簲鐨勬槸svy_lib_script_category鐨勭被鍒獻D")
+    @ApiModelProperty(value = "瀵瑰簲鐨勬槸svy_lib_script_category鐨勭被鍒獻D")
+    private Long categoryid;
     /**
      * 璇濇湳鍐呭
      */
@@ -240,4 +246,48 @@
     @ApiModelProperty(value = "缁勫埆")
     private String groupName;
 
+    @Excel(name = "璐d换绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "璐d换绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    private String dutyDeptName;
+
+    @Excel(name = "璐d换绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "璐d换绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    private String dutyDeptCode;
+
+    @Excel(name = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    private String reportDeptName;
+
+    @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    private String reportDeptCode;
+
+    @Excel(name = "璐d换绉戝璐d换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "璐d换绉戝璐d换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    private String dutyDeptPersonName;
+
+    @Excel(name = "璐d换绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "璐d换绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    private String dutyDeptPersonCode;
+
+    @Excel(name = "鎶ュ绉戝璐d换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    private String reportDeptPersonName;
+
+    @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "鎶ュ绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    private String reportDeptPersonCode;
+
+    /**
+     * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+     */
+    @ApiModelProperty("婊℃剰搴︽剰瑙佸紓甯革紙鍙拡瀵规枃鏈級")
+    private String isMydException;
+
+    /**
+     * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+     */
+    @ApiModelProperty("闂缁村害")
+    private String dimension;
+
 }

--
Gitblit v1.9.3