From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index 1e62b81..e76922f 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -327,10 +327,16 @@
private String inDeptcheckFlag;
/**
- * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0 鏈鐞� 1 澶勭悊
*/
- @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0 鏈鐞� 1 澶勭悊鎴愬姛 2 澶勭悊澶辫触 ")
private String inWardcheckFlag;
+
+ /**
+ * 鑽搧瀹ｆ暀闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0 鏈鐞� 1 澶勭悊
+ */
+ @ApiModelProperty(value = "鑽搧瀹ｆ暀闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0 鏈鐞� 1 澶勭悊鎴愬姛 2 澶勭悊澶辫触 ")
+ private String medcheckFlag;
/**
* 骞撮緞
@@ -390,7 +396,7 @@
/**
* 鍑哄叆闄㈡爣璇�
*/
- @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 2 杞 3 棰勫叆闄�")
+ @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 2 杞 3 棰勫叆闄� 4.婊℃剰搴�")
private Integer cry;
/**
@@ -550,4 +556,26 @@
@ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
@Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
private String inhospMydFlag;
+
+ /**
+ * 鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+ private String medicalCode;
+
+ /**
+ * 鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+ private String medicalName;
+
+ /**
+ * 鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+ private String medicalCompany;
+
}
--
Gitblit v1.9.3