From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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..e87ed24 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 = "闄㈠尯鍚嶇О")
@@ -92,6 +98,11 @@
private String icd10code;
/**
+ * 鍏ラ櫌璇婃柇ICD鍊肩紪鍙烽泦鍚�
+ */
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇ICD鍊肩紪鍙烽泦鍚�")
+ private List<String> icd10codeList;
+ /**
* 鍏ラ櫌璇婃柇鍚嶇О
*/
@ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
@@ -102,7 +113,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 +121,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 +129,11 @@
*/
@ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜")
private String deptcode;
+ /**
+ * 鍏ラ櫌绉戝浠ｇ爜
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜闆嗗悎")
+ private List<String> deptcodeList;
/**
* 鍏ラ櫌绉戝鍚嶇О
@@ -196,9 +212,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;
/**
@@ -285,7 +301,7 @@
* 绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
*/
@ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
- private String deptcheckFlag;
+ private String deptcheckFlag;
/**
* 鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
*/
@@ -296,11 +312,25 @@
*/
@ApiModelProperty(value = "鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
private String diagcheckFlag;
+
/**
- * 鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ * 浠诲姟缁勶紙appltype=5锛夐杞撼鍏ユ爣璁帮細0鏈鐞� 1宸茬敓鎴愰杞� 2鏃犲尮閰�/澶辫触
+ * 鐙珛浜� dept/ward/diag check_flag锛屼笓渚涗换鍔＄粍鐙珛鎵弿浣跨敤锛涘悗缁疆娆＄敱 rollTaskGroupCycle 璐熻矗銆�
*/
- @ApiModelProperty(value = "鎵嬫湳闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
- private String opercheckFlag;
+ @ApiModelProperty(value = "浠诲姟缁�(appltype=5)棣栬疆绾冲叆鏍囪锛�0鏈鐞� 1宸茬敓鎴愰杞� 2鏃犲尮閰�/澶辫触")
+ private String scheduleCheckFlag;
+
+ /**
+ * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inDeptcheckFlag;
+
+ /**
+ * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inWardcheckFlag;
/**
* 骞撮緞
@@ -360,7 +390,7 @@
/**
* 鍑哄叆闄㈡爣璇�
*/
- @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 ")
+ @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 2 杞 3 棰勫叆闄�")
private Integer cry;
/**
@@ -481,4 +511,11 @@
@ApiModelProperty("闄㈠尯")
@Excel(name = " 闄㈠尯 ")
private String campusid;
+
+ /**
+ * '婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�
+ */
+ @ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
+ @Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
+ private String inhospMydFlag;
}
--
Gitblit v1.9.3