From a820e1bb3c5bfeef213fa98d8cefb63c6b136040 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
index 35f086e..42536cc 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveOthreInfo.java
@@ -11,7 +11,7 @@
import java.util.List;
/**
- * 鎮ｈ�呭嚭鍏ラ櫌銆侀棬璇婁俊鎭� PatArchiveOthreInfo
+ * 鎮ｈ�呫�侀棬璇婁俊鎭� PatArchiveOthreInfo
*
* @author smartor
* @date 2023-03-04
@@ -41,6 +41,20 @@
@ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
@Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
private String notrequiredreason;
+
+
+ /**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�")
+ private String filterDrname;
+
+
+ /**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢熺紪鐮�")
+ private String filterDrcode;
/**
@@ -80,6 +94,21 @@
*/
@ApiModelProperty("GUID")
private String guid;
+
+ /**
+ * 闄㈠尯
+ */
+ @ApiModelProperty("闄㈠尯")
+ private String campusid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty("鍑洪櫌璇婃柇")
+ private String leavediagname;
+
+ @ApiModelProperty("鍑洪櫌璇婃柇ICD鍊�")
+ private String leaveicd10code;
/**
* 濮撳悕
@@ -186,6 +215,18 @@
@ApiModelProperty("骞撮緞鍗曚綅")
@Excel(name = " 骞撮緞鍗曚綅 ")
private String ageUnit;
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞")
+ @Excel(name = " 骞撮緞 ")
+ private Long age2;
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ @Excel(name = " 骞撮緞鍗曚綅 ")
+ private String ageUnit2;
/**
* 寤烘。鏃堕棿
@@ -208,6 +249,13 @@
@ApiModelProperty("鎵嬫満鍙风爜")
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+
+ /**
+ * 鎵嬫満鐭彿
+ */
+ @ApiModelProperty("鎵嬫満鐭彿")
+ @Excel(name = " 鎵嬫満鐭彿 ")
+ private String telshortcode;
/**
@@ -361,5 +409,8 @@
@ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
private String leavehospitaldistrictcode;
+ @ApiModelProperty("鍏ラ櫌鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
+
}
--
Gitblit v1.9.3