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/ServiceSubtaskScriptCount.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java
index 0bdd682..65cca88 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,10 +26,29 @@
private Long scriptid;
/**
+ * 妯℃澘ID
+ */
+ @ApiModelProperty(name = "妯℃澘ID")
+ private Long templateid;
+
+ /**
* 闂鍐呭
*/
@ApiModelProperty("闂鍐呭")
private String scriptContent;
+
+ /**
+ * 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ 4鍏跺畠
+ */
+ @ApiModelProperty(value = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ 4鍏跺畠")
+ private String scriptType;
+
+ /**
+ * 浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)
+ */
+ @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛屽鏁欙紱 4.閫氱煡)")
+ private String subtaskType;
/**
* 宸插~鍐欐暟閲�
@@ -66,6 +86,11 @@
@ApiModelProperty(value = "閫夋嫨姣斾緥")
private String chosenPercentage;
+ /**
+ * 闂閫夐」闆嗗悎锛岄�楀彿鍒嗗壊
+ */
+ @ApiModelProperty(value = "闂閫夐」闆嗗悎")
+ private String options;
/**
* 鏄庣粏
--
Gitblit v1.9.3