From fe47ff909096722ba8e9172c3e1f0f7910b16909 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 21 十月 2025 14:49:18 +0800
Subject: [PATCH] 结束出院日期格式
---
smartor/src/main/java/com/smartor/domain/PatMedOperation.java | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 413 insertions(+), 49 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
index 7098106..ba4c151 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
@@ -13,7 +13,7 @@
* 鎮ｈ�呮墜鏈褰曞璞� pat_med_operation
*
* @author lihu
- * @date 2024-08-05
+ * @date 2025-02-25
*/
@Data
@ApiModel("鎮ｈ�呮墜鏈褰�")
@@ -24,57 +24,207 @@
* 鑷ID
*/
@ApiModelProperty("鑷ID")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
private Long id;
/**
- * 灏辫瘖娴佹按鍙�
+ * 鐥呬汉ID
*/
- @ApiModelProperty("灏辫瘖娴佹按鍙�")
- @Excel(name = "灏辫瘖娴佹按鍙�")
- private String serialnum;
-
- /**
- * 妗ｆID
- */
- @ApiModelProperty("妗ｆID")
- @Excel(name = "妗ｆID")
+ @ApiModelProperty("鐥呬汉ID")
+ @Excel(name = "鐥呬汉ID")
private Long patid;
/**
- * 鎵嬫湳鍚嶇О
+ * 鐥呬汉缂栧彿
*/
- @ApiModelProperty("鎵嬫湳鍚嶇О")
- @Excel(name = "鎵嬫湳鍚嶇О")
- private String operationname;
+ @ApiModelProperty("鐥呬汉缂栧彿")
+ @Excel(name = "鐥呬汉缂栧彿")
+ private String patcode;
/**
- * 鎵嬫湳浠ｇ爜
+ * 鐥呬汉濮撳悕
*/
- @ApiModelProperty("鎵嬫湳浠ｇ爜")
- @Excel(name = "鎵嬫湳浠ｇ爜")
- private String operationcode;
+ @ApiModelProperty("鐥呬汉濮撳悕")
+ @Excel(name = "鐥呬汉濮撳悕")
+ private String paname;
/**
- * 鎵嬫湳ID
+ * 鎵嬫湳鐢宠鍗旾D
*/
- @ApiModelProperty("鎵嬫湳ID")
- @Excel(name = "鎵嬫湳ID")
- private Long operationid;
+ @ApiModelProperty("鎵嬫湳鐢宠鍗旾D")
+ @Excel(name = "鎵嬫湳鐢宠鍗旾D")
+ private Long opreqid;
/**
- * 鎵嬫湳鏃堕棿
+ * 鎵嬫湳鐢宠鍗曞彿
*/
- @ApiModelProperty("鎵嬫湳鏃堕棿")
+ @ApiModelProperty("鎵嬫湳鐢宠鍗曞彿")
+ @Excel(name = "鎵嬫湳鐢宠鍗曞彿")
+ private String opreqcode;
+
+ /**
+ * 鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁�
+ * C锛嶅彇娑� F锛嶇粨鏉�
+ */
+ @ApiModelProperty("鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+ @Excel(name = "鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+ private String opsstatus;
+
+ /**
+ * 鎵嬫湳绫诲埆浠ｇ爜
+ */
+ @ApiModelProperty("鎵嬫湳绫诲埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绫诲埆浠ｇ爜")
+ private String optypecode;
+
+ /**
+ * 鎵嬫湳绫诲埆鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳绫诲埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绫诲埆鍚嶇О")
+ private String optypename;
+
+ /**
+ * 瑕佹眰鎵嬫湳鏃堕棿
+ */
+ @ApiModelProperty("瑕佹眰鎵嬫湳鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎵嬫湳鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date operationtime;
+ @Excel(name = "瑕佹眰鎵嬫湳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operatortime;
/**
- * 灏辫瘖ID
+ * 鎵嬫湳鐢宠鏃堕棿
*/
- @ApiModelProperty("灏辫瘖ID")
- @Excel(name = "灏辫瘖ID")
- private Long visitid;
+ @ApiModelProperty("鎵嬫湳鐢宠鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎵嬫湳鐢宠鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date opreqtime;
+
+ /**
+ * 鐢宠鍖荤敓缂栧彿
+ */
+ @ApiModelProperty("鐢宠鍖荤敓缂栧彿")
+ @Excel(name = "鐢宠鍖荤敓缂栧彿")
+ private String reqdoccode;
+
+ /**
+ * 鐢宠鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("鐢宠鍖荤敓濮撳悕")
+ @Excel(name = "鐢宠鍖荤敓濮撳悕")
+ private String reqdocname;
+
+ /**
+ * 鐢宠绉戝缂栧彿
+ */
+ @ApiModelProperty("鐢宠绉戝缂栧彿")
+ @Excel(name = "鐢宠绉戝缂栧彿")
+ private String reqdeptcode;
+
+ /**
+ * 鐢宠绉戝鍚嶇О
+ */
+ @ApiModelProperty("鐢宠绉戝鍚嶇О")
+ @Excel(name = "鐢宠绉戝鍚嶇О")
+ private String reqdeptname;
+
+ /**
+ * 鎵嬫湳绉戝缂栧彿
+ */
+ @ApiModelProperty("鎵嬫湳绉戝缂栧彿")
+ @Excel(name = "鎵嬫湳绉戝缂栧彿")
+ private String reqloccode;
+
+ /**
+ * 鎵嬫湳绉戝鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳绉戝鍚嶇О")
+ @Excel(name = "鎵嬫湳绉戝鍚嶇О")
+ private String reqlocname;
+
+ /**
+ * 涓诲垁鍖荤敓缂栧彿
+ */
+ @ApiModelProperty("涓诲垁鍖荤敓缂栧彿")
+ @Excel(name = "涓诲垁鍖荤敓缂栧彿")
+ private String surgeoncode;
+
+ /**
+ * 涓诲垁鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("涓诲垁鍖荤敓濮撳悕")
+ @Excel(name = "涓诲垁鍖荤敓濮撳悕")
+ private String surgeonname;
+
+ /**
+ * 涓�鍔╁尰鐢熺紪鍙�
+ */
+ @ApiModelProperty("涓�鍔╁尰鐢熺紪鍙�")
+ @Excel(name = "涓�鍔╁尰鐢熺紪鍙�")
+ private String firasscode;
+
+ /**
+ * 涓�鍔╁尰鐢熷鍚�
+ */
+ @ApiModelProperty("涓�鍔╁尰鐢熷鍚�")
+ @Excel(name = "涓�鍔╁尰鐢熷鍚�")
+ private String firassname;
+
+ /**
+ * 浜屽姪鍖荤敓缂栧彿
+ */
+ @ApiModelProperty("浜屽姪鍖荤敓缂栧彿")
+ @Excel(name = "浜屽姪鍖荤敓缂栧彿")
+ private String secasscode;
+
+ /**
+ * 浜屽姪鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("浜屽姪鍖荤敓濮撳悕")
+ @Excel(name = "浜屽姪鍖荤敓濮撳悕")
+ private String secassname;
+
+ /**
+ * 涓夊姪鍖荤敓缂栧彿
+ */
+ @ApiModelProperty("涓夊姪鍖荤敓缂栧彿")
+ @Excel(name = "涓夊姪鍖荤敓缂栧彿")
+ private String thrasscode;
+
+ /**
+ * 涓夊姪鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("涓夊姪鍖荤敓濮撳悕")
+ @Excel(name = "涓夊姪鍖荤敓濮撳悕")
+ private String thrassname;
+
+ /**
+ * 浣滃簾鏃堕棿
+ */
+ @ApiModelProperty("浣滃簾鏃堕棿")
+ @Excel(name = "浣滃簾鏃堕棿")
+ private String canceltime;
+
+ /**
+ * 浣滃簾鍘熷洜
+ */
+ @ApiModelProperty("浣滃簾鍘熷洜")
+ @Excel(name = "浣滃簾鍘熷洜")
+ private String cancelreason;
+
+ /**
+ * 浣滃簾鐢宠浜虹紪鍙�
+ */
+ @ApiModelProperty("浣滃簾鐢宠浜虹紪鍙�")
+ @Excel(name = "浣滃簾鐢宠浜虹紪鍙�")
+ private String cancelcode;
+
+ /**
+ * 浣滃簾鐢宠浜哄鍚�
+ */
+ @ApiModelProperty("浣滃簾鐢宠浜哄鍚�")
+ @Excel(name = "浣滃簾鐢宠浜哄鍚�")
+ private String cancelname;
/**
* 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴
@@ -84,18 +234,19 @@
private Long visittype;
/**
- * 鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�
+ * 鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁�
+ * C锛嶅彇娑� F锛嶇粨鏉�
*/
- @ApiModelProperty("鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�")
- @Excel(name = "鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�")
- private Long status;
+ @ApiModelProperty("鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+ @Excel(name = "鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+ private String status;
/**
* 鏂规鐘舵�佹搷浣滄椂闂�
*/
@ApiModelProperty("鏂规鐘舵�佹搷浣滄椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏂规鐘舵�佹搷浣滄椂闂�" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏂规鐘舵�佹搷浣滄椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date schemetime;
/**
@@ -104,13 +255,6 @@
@ApiModelProperty("鏄惁鐢熸垚璁″垝;0鏈敓鎴� 1鐢熸垚鎵嬫湳鍓� 2鐢熸垚鎵嬫湳鍚� 9鏃犲尮閰嶆柟妗�")
@Excel(name = "鏄惁鐢熸垚璁″垝;0鏈敓鎴� 1鐢熸垚鎵嬫湳鍓� 2鐢熸垚鎵嬫湳鍚� 9鏃犲尮閰嶆柟妗�")
private Long schemestatus;
-
- /**
- * 鏈烘瀯ID
- */
- @ApiModelProperty("鏈烘瀯ID")
- @Excel(name = "鏈烘瀯ID")
- private String orgid;
/**
* 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
@@ -122,7 +266,7 @@
* 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
*/
@ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
- @Excel(name = "涓婁紶鏍囧織" , readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+ @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
private Long isupload;
/**
@@ -130,8 +274,29 @@
*/
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "涓婁紶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date uploadTime;
+
+ /**
+ * 鍖婚櫌鏈烘瀯ID
+ */
+ @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty("GUID")
+ @Excel(name = "GUID")
+ private String guid;
+
+ /**
+ * 鐖禛UID
+ */
+ @ApiModelProperty("鐖禛UID")
+ @Excel(name = "鐖禛UID")
+ private String pguid;
/**
* 鐖禝D
@@ -141,11 +306,210 @@
private Long pid;
/**
- * GUID
+ * 灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�
*/
- @ApiModelProperty("GUID")
- @Excel(name = "GUID")
- private String guid;
+ @ApiModelProperty("灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+ @Excel(name = "灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+ private String inhospstate;
+
+ /**
+ * 鎮ｈ�呮。妗堢紪鍙�
+ */
+ @ApiModelProperty("鎮ｈ�呮。妗堢紪鍙�")
+ @Excel(name = "鎮ｈ�呮。妗堢紪鍙�")
+ private String patno;
+
+ /**
+ * 鐥呬汉濮撳悕
+ */
+ @ApiModelProperty("鐥呬汉濮撳悕")
+ @Excel(name = "鐥呬汉濮撳悕")
+ private String patname;
+
+ /**
+ * 闂ㄨ瘖灏辫瘖ID
+ */
+ @ApiModelProperty("闂ㄨ瘖灏辫瘖ID")
+ @Excel(name = "闂ㄨ瘖灏辫瘖ID")
+ private Long visitid;
+
+ /**
+ * 灏辫瘖娴佹按鍙�
+ */
+ @ApiModelProperty("灏辫瘖娴佹按鍙�")
+ @Excel(name = "灏辫瘖娴佹按鍙�")
+ private String serialnum;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ @Excel(name = "浣忛櫌鍙�")
+ private String inhospno;
+
+ /**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty("鍖婚櫌鍚嶇О")
+ @Excel(name = "鍖婚櫌鍚嶇О")
+ private String hospitalname;
+
+ /**
+ * 鍖婚櫌缂栧彿
+ */
+ @ApiModelProperty("鍖婚櫌缂栧彿")
+ @Excel(name = "鍖婚櫌缂栧彿")
+ private String hospitalcode;
+
+ /**
+ * 灏辫瘖绉戝ID
+ */
+ @ApiModelProperty("灏辫瘖绉戝ID")
+ @Excel(name = "灏辫瘖绉戝ID")
+ private String deptid;
+
+ /**
+ * 绉戝浠ｇ爜
+ */
+ @ApiModelProperty("绉戝浠ｇ爜")
+ @Excel(name = "绉戝浠ｇ爜")
+ private String deptcode;
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @ApiModelProperty("绉戝鍚嶇О")
+ @Excel(name = "绉戝鍚嶇О")
+ private String deptname;
+
+ /**
+ * 鐥呭尯缂栧彿
+ */
+ @ApiModelProperty("鐥呭尯缂栧彿")
+ @Excel(name = "鐥呭尯缂栧彿")
+ private String hospitaldistrictcode;
+
+ /**
+ * 鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty("鐥呭尯鍚嶇О")
+ @Excel(name = "鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
+
+ /**
+ * 鎴块棿鍙�
+ */
+ @ApiModelProperty("鎴块棿鍙�")
+ @Excel(name = "鎴块棿鍙�")
+ private String roomno;
+
+ /**
+ * 搴婁綅鍙�
+ */
+ @ApiModelProperty("搴婁綅鍙�")
+ @Excel(name = "搴婁綅鍙�")
+ private String bedNo;
+
+ /**
+ * 涓绘不鍖荤敓宸ュ彿
+ */
+ @ApiModelProperty("涓绘不鍖荤敓宸ュ彿")
+ @Excel(name = "涓绘不鍖荤敓宸ュ彿")
+ private String drcode;
+
+ /**
+ * 涓绘不鍖荤敓鍚嶇О
+ */
+ @ApiModelProperty("涓绘不鍖荤敓鍚嶇О")
+ @Excel(name = "涓绘不鍖荤敓鍚嶇О")
+ private String drname;
+
+ /**
+ * 鎶ゅ＋ID
+ */
+ @ApiModelProperty("鎶ゅ＋ID")
+ @Excel(name = "鎶ゅ＋ID")
+ private String nurseId;
+
+ /**
+ * 鎶ゅ＋濮撳悕
+ */
+ @ApiModelProperty("鎶ゅ＋濮撳悕")
+ @Excel(name = "鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ /**
+ * 闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触
+ */
+ @ApiModelProperty("闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ @Excel(name = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ private String checkFlag;
+
+ /**
+ * 闀挎湡浠诲姟 锛屽け璐ュ師鍥�
+ */
+ @ApiModelProperty("闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ @Excel(name = "闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ private String longTaskReason;
+
+ /**
+ * 鎵嬫湳id
+ */
+ @ApiModelProperty("鎵嬫湳id")
+ @Excel(name = "鎵嬫湳id")
+ private String opid;
+
+ /**
+ * 鎵嬫湳鍚嶇ОID
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇ОID")
+ @Excel(name = "鎵嬫湳鍚嶇ОID")
+ private String opcode;
+
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
+ private String opdesc;
+
+ /**
+ * 鎵嬫湳绾у埆浠ｇ爜
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
+ private String oplevelcode;
+
+ /**
+ * 鎵嬫湳绾у埆鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+ private String opleveldesc;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫墜鏈椂闂�")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鎵嬫湳鏃堕棿")
+ private Date endTime;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
}
--
Gitblit v1.9.3