From cc3fe1ad9b366533d184d9e239b45f731f014e74 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 23 四月 2026 11:22:38 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..80119b4 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;
/**
* 鍏ラ櫌绉戝鍚嶇О
@@ -296,11 +307,6 @@
*/
@ApiModelProperty(value = "鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
private String diagcheckFlag;
- /**
- * 鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
- */
- @ApiModelProperty(value = "鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
- private String opercheckFlag;
/**
* 骞撮緞
--
Gitblit v1.9.3