From e5248157af311961bee52db474c2ee8abb741843 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 22 十一月 2023 17:51:18 +0800
Subject: [PATCH] 会诊
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 337f0aa..0d0dd11 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -55,9 +55,9 @@
* 瀹㈡埛瀵硅薄
*/
@Excels({
- @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT,defaultValue = "鏃�"),
- @Excel(name = "瀹㈡埛鎬у埆", targetAttr = "cusSex", type = Excel.Type.EXPORT,readConverterExp="0=鐢�,1=濂�",defaultValue = "鏃�"),
- @Excel(name = "瀹㈡埛鐢佃瘽", targetAttr = "cusPhone", type = Excel.Type.EXPORT,defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鎬у埆", targetAttr = "cusSex", type = Excel.Type.EXPORT, readConverterExp = "0=鐢�,1=濂�", defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鐢佃瘽", targetAttr = "cusPhone", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
})
@TableField(exist = false)
@ApiModelProperty(value = "瀹㈡埛瀵硅薄")
@@ -66,7 +66,7 @@
/**
* 浣撴绫诲瀷
*/
- @Excel(name = "浣撴绫诲瀷",readConverterExp="2=涓汉,1=鍥㈤槦")
+ @Excel(name = "浣撴绫诲瀷", readConverterExp = "2=涓汉,1=鍥㈤槦")
@ApiModelProperty(value = "浣撴绫诲瀷")
private String tjType;
@@ -80,7 +80,7 @@
/**
* 娴佹按鍙凤紙鏃堕棿鎴崇敓鎴愶級
*/
- @Excel(name = "娴佹按鍙�",defaultValue = "鏃�")
+ @Excel(name = "娴佹按鍙�", defaultValue = "鏃�")
@ApiModelProperty(value = "娴佹按鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String tjSerialNumber;
@@ -88,7 +88,7 @@
/**
* 鎵�閫夊椁愶紙缁戝畾濂楅琛級
*/
- @Excel(name = "鎵�閫夊椁�",defaultValue = "鏃�")
+ @Excel(name = "鎵�閫夊椁�", defaultValue = "鏃�")
@ApiModelProperty(value = "鎵�閫夊椁�")
@JsonSerialize(using = ToStringSerializer.class)
private String pacId;
@@ -100,16 +100,16 @@
* 浣撴瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "浣撴瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛湭瀹屾垚")
+ @Excel(name = "浣撴瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛湭瀹屾垚")
@ApiModelProperty(value = "浣撴瀹屾垚鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE,updateStrategy = FieldStrategy.IGNORED)
+ @TableField(fill = FieldFill.INSERT_UPDATE, updateStrategy = FieldStrategy.IGNORED)
private Date finishTime;
/**
* 鍑烘姤鍛婃椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍑烘姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛棤鎶ュ憡")
+ @Excel(name = "鍑烘姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛棤鎶ュ憡")
@ApiModelProperty(value = "鍑烘姤鍛婃椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date reportTime;
@@ -118,21 +118,21 @@
* 鍗曚綅ID锛堝閿級
*/
@ApiModelProperty(value = "鍗曚綅ID")
- @Excel(name = "鍗曚綅ID",defaultValue = "鏃�")
+ @Excel(name = "鍗曚綅ID", defaultValue = "鏃�")
@JsonSerialize(using = ToStringSerializer.class)
private String firmId;
/**
* 閮ㄩ棬鍚�
*/
- @Excel(name = "閮ㄩ棬鍚�",defaultValue = "鏃�")
+ @Excel(name = "閮ㄩ棬鍚�", defaultValue = "鏃�")
@ApiModelProperty(value = "閮ㄩ棬鍚�")
private String firmDeptName;
/**
* 鍦ㄥ崟浣嶅伐鍙�
*/
- @Excel(name = "鍦ㄥ崟浣嶅伐鍙�",defaultValue = "鏃�")
+ @Excel(name = "鍦ㄥ崟浣嶅伐鍙�", defaultValue = "鏃�")
@ApiModelProperty(value = "鍦ㄥ崟浣嶅伐鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String firmWorkId;
@@ -143,7 +143,7 @@
/**
* 鎬绘鍖荤敓鍚嶅瓧
*/
- @Excel(name = "鎬绘鍖荤敓",defaultValue = "鏃�")
+ @Excel(name = "鎬绘鍖荤敓", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬绘鍖荤敓")
private String checkDoctor;
@@ -151,7 +151,7 @@
* 鎬绘鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎬绘鏃堕棿",defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎬绘鏃堕棿", defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鎬绘鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private Date checkTime;
@@ -159,7 +159,7 @@
/**
* 鎬讳綋寤鸿
*/
- @Excel(name = "鎬讳綋寤鸿",defaultValue = "鏃�")
+ @Excel(name = "鎬讳綋寤鸿", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬讳綋寤鸿")
private String checkAdvice;
@@ -167,7 +167,7 @@
* 鍙戝竷鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍙戝竷鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛湭鍙戝竷")
+ @Excel(name = "鍙戝竷鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛湭鍙戝竷")
@ApiModelProperty(value = "鍙戝竷鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date releaseTime;
@@ -175,19 +175,19 @@
/**
* 鏄惁鍙戦�侀偖浠�
*/
- @Excel(name = "鏄惁鍙戦�侀偖浠�",readConverterExp="1=宸插彂閫�,0=鏈彂閫�")
+ @Excel(name = "鏄惁鍙戦�侀偖浠�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
@ApiModelProperty(value = "鏄惁鍙戦�侀偖浠�")
private String sendEmail;
/**
* 鏄惁鍙戦�佺煭淇�
*/
- @Excel(name = "鏄惁鍙戦�佺煭淇�",readConverterExp="1=宸插彂閫�,0=鏈彂閫�")
+ @Excel(name = "鏄惁鍙戦�佺煭淇�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
@ApiModelProperty(value = "鏄惁鍙戦�佺煭淇�")
private String sendMessage;
- @Excel(name = "鎬绘瀹℃牳鐘舵��",readConverterExp="1=宸插鏍�,0=鏈鏍�")
+ @Excel(name = "鎬绘瀹℃牳鐘舵��", readConverterExp = "1=宸插鏍�,0=鏈鏍�")
@ApiModelProperty(value = "鎬绘瀹℃牳鐘舵��")
private Integer checkStatus;
@@ -195,7 +195,7 @@
/**
* 鏄惁澶嶆
*/
- @Excel(name = "鏄惁澶嶆",readConverterExp="1=鍚�,0=鏄�")
+ @Excel(name = "鏄惁澶嶆", readConverterExp = "1=鍚�,0=鏄�")
@ApiModelProperty(value = "鏄惁澶嶆")
private Integer isReturn;
@@ -203,7 +203,7 @@
* 鎶ュ憡鏈�鍚庢墦鍗版椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = " pc鏈�鍚庢墦鍗版姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏃�")
+ @Excel(name = " pc鏈�鍚庢墦鍗版姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
@ApiModelProperty(value = "鎶ュ憡鏈�鍚庢墦鍗版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date printLastTime;
@@ -212,11 +212,10 @@
* 鎶ュ憡鏈�鍚庝笅杞芥椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏃�")
+ @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
@ApiModelProperty(value = "鎶ュ憡鏈�鍚庝笅杞芥椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date downloadLastTime;
-
/**
@@ -352,7 +351,7 @@
@ApiModelProperty("宸叉墦鍗版湭鎵撳嵃")
@TableField(exist = false)
- private Integer type=0;
+ private Integer type = 0;
@ApiModelProperty("涓汉妯℃澘id")
@TableField(exist = false)
@@ -366,15 +365,12 @@
@ApiModelProperty("寰俊鏀粯璁㈠崟涓婚敭id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mallOrderId;
-
-
/**
* 浣撴鐘舵��
*/
- @Excel(name = "浣撴鐘舵��",defaultValue = "鏃�")
+ @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
@ApiModelProperty(value = "浣撴鐘舵��")
private Integer status;
-
/**
* 鍒濆
*/
@@ -394,6 +390,30 @@
private String firmDeptId;
+ /**
+ * 鏍告敹鐘舵��
+ */
+ @ApiModelProperty(value = "鏍告敹鐘舵��")
+ private Integer heshouStatus;
+ /**
+ * 鏍告敹浜�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏍告敹鏃堕棿")
+ private Date heshouTime;
+ /**
+ * 鏍告敹浜�
+ */
+ @ApiModelProperty(value = "鏍告敹浜�")
+ private String heshouDoctor;
+
+ /**
+ * 鏈夋棤浼氳瘖
+ */
+ @ApiModelProperty(value = "鏈夋棤浼氳瘖")
+ private Integer isHz;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0