From 3fc51e7cbdabb7dcd1615c6efac52323f6ca8adb Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 03 七月 2024 18:28:34 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 9 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java index af693c3..c7d45e2 100644 --- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java +++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java @@ -1,12 +1,10 @@ package com.smartor.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import java.util.Date; @@ -81,14 +79,14 @@ */ @Excel(name = "搴婂彿") @ApiModelProperty("搴婂彿") - private Long bedno; + private String bedNo; /** * 绉戝 */ @Excel(name = "绉戝") @ApiModelProperty("绉戝") - private String dept; + private String deptName; /** * 绉戝 @@ -121,9 +119,9 @@ /** * 鐥呭巻鍙� */ - @Excel(name = "鍙戦�佺姸鎬�") - @ApiModelProperty("鍙戦�佺姸鎬�") - private Integer sendStatus; + @Excel(name = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�") + @ApiModelProperty("鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�") + private Long sendState; /** @@ -132,6 +130,13 @@ @Excel(name = "鍙戦�佹椂闂�") @ApiModelProperty("鍙戦�佹椂闂�") private Date sendTime; + + /** + * 鍏ラ櫌鏃堕棿 + */ + @Excel(name = "鍏ラ櫌鏃堕棿") + @ApiModelProperty("鍏ラ櫌鏃堕棿") + private Date inhosptime; /** * 鍙戦�佹椂闂� @@ -148,6 +153,13 @@ @ApiModelProperty("鎿嶄綔浜�") private String operatePerson; + /** + * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛� + */ + @Excel(name = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�") + @ApiModelProperty("灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�") + private String hospType; + /** * 鎺ユ敹鏃堕棿 @@ -157,9 +169,30 @@ private String receiveTime; /** + * 璇婃柇鍚嶇О + */ + @Excel(name = "璇婃柇鍚嶇О") + @ApiModelProperty(value = "璇婃柇鍚嶇О") + private String diagname; + + /** * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎 */ @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎") private Integer isoperation; + /** + * 鐥呮埧鍙� + */ + @Excel(name = "鐥呮埧鍙�") + @ApiModelProperty(value = "鐥呮埧鍙�") + private String roomno; + + /** + * 鏂囨湰鍙橀噺鍙傛暟 + */ + @Excel(name = "鏂囨湰鍙橀噺鍙傛暟") + @ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟") + private String textParam; + } -- Gitblit v1.9.3