From 6e3d0a2097a4d841e941a84ec54780a67eb60ba1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 10 七月 2026 09:22:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
index 0858d12..326be38 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鎮ｈ�呮鏌ユ楠岃褰曞瓙瀵硅薄 pat_med_operation_item
@@ -39,7 +40,7 @@
*/
@ApiModelProperty("鎵嬫湳id")
@Excel(name = "鎵嬫湳id")
- private Long opid;
+ private String opid;
/**
* 鎵嬫湳鍚嶇ОID
@@ -146,5 +147,84 @@
@Excel(name = "鐖禝D")
private Long pid;
+ @ApiModelProperty(value = "鏈�鍚庡紑濮嬫椂闂�")
+ private String lastStartTime;
+
+ @ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
+ private String lastEndTime;
+
+ /**
+ * 鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String opercheckFlag;
+
+ @ApiModelProperty("闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ @Excel(name = "闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ private String longTaskReason;
+
+ /**
+ * 绉戝浠ｇ爜
+ */
+ @ApiModelProperty("绉戝浠ｇ爜")
+ private String deptcode;
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @ApiModelProperty("绉戝鍚嶇О")
+ private String deptname;
+
+ /**
+ * 鐥呭尯缂栧彿
+ */
+ @ApiModelProperty("鐥呭尯缂栧彿")
+ private String hospitaldistrictcode;
+
+ /**
+ * 鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty("鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
+
+ @ApiModelProperty("鎮ｈ�匢D")
+ private Long patid;
+
+ /**
+ * 涓绘不鍖荤敓宸ュ彿
+ */
+ @ApiModelProperty("涓绘不鍖荤敓宸ュ彿")
+ @Excel(name = "涓绘不鍖荤敓宸ュ彿")
+ private String drcode;
+
+ /**
+ * 涓绘不鍖荤敓鍚嶇О
+ */
+ @ApiModelProperty("涓绘不鍖荤敓鍚嶇О")
+ @Excel(name = "涓绘不鍖荤敓鍚嶇О")
+ private String drname;
+
+ /**
+ * 鎶ゅ＋ID
+ */
+ @ApiModelProperty("鎶ゅ＋ID")
+ @Excel(name = "鎶ゅ＋ID")
+ private String nurseId;
+
+ /**
+ * 鎶ゅ＋濮撳悕
+ */
+ @ApiModelProperty("鎶ゅ＋濮撳悕")
+ @Excel(name = "鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ @ApiModelProperty(value = "鐥呭尯缂栫爜闆嗗悎")
+ private List<String> wardCodes;
+
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜闆嗗悎")
+ private List<String> deptCodes;
+
+ @ApiModelProperty(value = "鎵嬫湳绛夌骇闆嗗悎")
+ private List<String> opLevelCodes;
}
--
Gitblit v1.9.3