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/PatMedOperation.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
index f432488..d6b6ae6 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
@@ -13,7 +13,7 @@
* 鎮ｈ�呮墜鏈褰曞璞� pat_med_operation
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Data
@ApiModel("鎮ｈ�呮墜鏈褰�")
@@ -33,6 +33,12 @@
@ApiModelProperty("鐥呬汉ID")
@Excel(name = "鐥呬汉ID")
private Long patid;
+
+ /**
+ * his绯荤粺ID
+ */
+ @ApiModelProperty("his绯荤粺ID")
+ private String patidHis;
/**
* 鐥呬汉缂栧彿
@@ -71,18 +77,18 @@
private String opsstatus;
/**
- * 鎵嬫湳浠ｇ爜
+ * 鎵嬫湳绫诲埆浠ｇ爜
*/
- @ApiModelProperty("鎵嬫湳浠ｇ爜")
- @Excel(name = "鎵嬫湳浠ｇ爜")
- private String operationcode;
+ @ApiModelProperty("鎵嬫湳绫诲埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绫诲埆浠ｇ爜")
+ private String optypecode;
/**
- * 鎵嬫湳鍚嶇О
+ * 鎵嬫湳绫诲埆鍚嶇О
*/
- @ApiModelProperty("鎵嬫湳鍚嶇О")
- @Excel(name = "鎵嬫湳鍚嶇О")
- private String operationname;
+ @ApiModelProperty("鎵嬫湳绫诲埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绫诲埆鍚嶇О")
+ private String optypename;
/**
* 瑕佹眰鎵嬫湳鏃堕棿
@@ -438,5 +444,84 @@
@Excel(name = "鎶ゅ＋濮撳悕")
private String nurseName;
+ /**
+ * 闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触
+ */
+ @ApiModelProperty("闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ @Excel(name = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ private String checkFlag;
+
+ /**
+ * 闀挎湡浠诲姟 锛屽け璐ュ師鍥�
+ */
+ @ApiModelProperty("闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ @Excel(name = "闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ private String longTaskReason;
+
+ /**
+ * 鎵嬫湳id
+ */
+ @ApiModelProperty("鎵嬫湳id")
+ @Excel(name = "鎵嬫湳id")
+ private String opid;
+
+ /**
+ * 鎵嬫湳鍚嶇ОID
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇ОID")
+ @Excel(name = "鎵嬫湳鍚嶇ОID")
+ private String opcode;
+
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
+ private String opdesc;
+
+ /**
+ * 鎵嬫湳绾у埆浠ｇ爜
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
+ private String oplevelcode;
+
+ /**
+ * 鎵嬫湳绾у埆鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+ private String opleveldesc;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫墜鏈椂闂�")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鎵嬫湳鏃堕棿")
+ private Date endTime;
+
+ @ApiModelProperty(value = "鏈�鍚庡紑濮嬫椂闂�")
+ private String lastStartTime;
+
+ @ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
+ private String lastEndTime;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
+
}
--
Gitblit v1.9.3