From 336d113220f675976f864ad3eab7df7cd432808d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 01 五月 2026 08:35:43 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index 5e87e28..bac3626 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -79,6 +79,12 @@
private String hospitaldistrictcode;
/**
+ * 闄㈠尯缂栧彿闆嗗悎
+ */
+ @ApiModelProperty(value = "闄㈠尯缂栧彿闆嗗悎")
+ private List<String> hospitaldistrictcodeList;
+
+ /**
* 闄㈠尯鍚嶇О
*/
@ApiModelProperty(value = "闄㈠尯鍚嶇О")
@@ -102,7 +108,7 @@
*/
@ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date starttime;
/**
@@ -110,7 +116,7 @@
*/
@ApiModelProperty(value = "鍑洪櫌鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date endtime;
/**
@@ -118,6 +124,11 @@
*/
@ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜")
private String deptcode;
+ /**
+ * 鍏ラ櫌绉戝浠ｇ爜
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜闆嗗悎")
+ private List<String> deptcodeList;
/**
* 鍏ラ櫌绉戝鍚嶇О
@@ -196,9 +207,9 @@
private String drname;
/**
- * 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗� 3鐢熸垚鍏ラ櫌鎾ら攢 4鐢熸垚鍑洪櫌鎾ら攢
+ * 鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗� 3鐢熸垚鍏ラ櫌鎾ら攢 4鐢熸垚鍑洪櫌鎾ら攢
*/
- @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗� 3鐢熸垚鍏ラ櫌鎾ら攢 4鐢熸垚鍑洪櫌鎾ら攢")
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗� 3鐢熸垚鍏ラ櫌鎾ら攢 4鐢熸垚鍑洪櫌鎾ら攢")
private Long schemestatus;
/**
@@ -303,6 +314,18 @@
private String opercheckFlag;
/**
+ * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inDeptcheckFlag;
+
+ /**
+ * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inWardcheckFlag;
+
+ /**
* 骞撮緞
*/
@ApiModelProperty(value = "骞撮緞")
--
Gitblit v1.9.3