From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 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 c108280..0bba67d 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 = "闄㈠尯鍚嶇О")
@@ -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;
/**
@@ -278,7 +289,7 @@
/**
* 浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�
*/
- @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+ @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉� 3寰呭叆闄�")
private String inhospstate;
/**
@@ -296,6 +307,18 @@
*/
@ApiModelProperty(value = "鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
private String diagcheckFlag;
+
+ /**
+ * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inDeptcheckFlag;
+
+ /**
+ * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String inWardcheckFlag;
/**
* 骞撮緞
@@ -327,6 +350,18 @@
*/
@ApiModelProperty("pageSize")
private Integer pageSize;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pn")
+ private Integer pn;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("ps")
+ private Integer ps;
/**
* 鍑洪櫌鏂瑰紡搴忓彿
*/
@@ -343,7 +378,7 @@
/**
* 鍑哄叆闄㈡爣璇�
*/
- @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 ")
+ @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 2 杞 3 棰勫叆闄�")
private Integer cry;
/**
@@ -437,4 +472,70 @@
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = " 璇佷欢鍙风爜 ")
private String idcardno;
+
+ /**
+ * 缁忕鍖荤敓
+ */
+ @ApiModelProperty("缁忕鍖荤敓")
+ @Excel(name = " 缁忕鍖荤敓 ")
+ private String managementDoctor;
+
+ /**
+ * 缁忕鍖荤敓
+ */
+ @ApiModelProperty("缁忕鍖荤敓")
+ @Excel(name = " 缁忕鍖荤敓 ")
+ private String managementDoctorCode;
+
+ @ApiModelProperty(value = "鏈�鍚庡紑濮嬫椂闂�")
+ private String lastStartTime;
+
+ @ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
+ private String lastEndTime;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty("闄㈠尯")
+ @Excel(name = " 闄㈠尯 ")
+ private String campusid;
+
+ /**
+ * 灏辫瘖鏉ユ簮ID
+ */
+ @ApiModelProperty("灏辫瘖鏉ユ簮ID")
+ @Excel(name = " 灏辫瘖鏉ユ簮ID ")
+ private String encounterSourceId;
+
+ /**
+ * 閲嶈鎬ф爣璁扮紪鐮�
+ * 鏋氫妇绫诲瀷锛欼mportFlagEnum
+ * FH0165.98 - 鐗圭害浜哄憳
+ * FH0165.99 - 绂讳紤浜哄憳
+ * FH0165.03 - 鏃�
+ * FH0165.02 - 鏃ラ棿璇婄枟
+ * FH0165.01 - 鏃ラ棿鎵嬫湳
+ */
+ @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮�", example = "FH0165.01")
+ @Excel(name = " 閲嶈鎬ф爣璁扮紪鐮� ")
+ private String importanceFlagCode;
+
+ /**
+ * 绱ф�ョ▼搴︾紪鐮�
+ * 鏋氫妇绫诲瀷锛欵mergencyLevelEnum
+ * FH0164.01 - 鐩爣
+ * FH0164.02 - 鎬ュ嵄閲�
+ * FH0164.03 - 鎷╂湡
+ * FH0164.04 - 鍩虹
+ */
+ @ApiModelProperty(value = "绱ф�ョ▼搴︾紪鐮�", example = "FH0164.01")
+ @Excel(name = " 绱ф�ョ▼搴︾紪鐮� ")
+ private String emergencyLevelCode;
+
+ /**
+ * '婊℃剰搴︽爣璇嗭細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