From 459aa78c84cf552ebea6ef056d978c2531d71ac8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 三月 2026 17:14:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java | 575 ++++++++++++++++++++++++---------------------------------
1 files changed, 244 insertions(+), 331 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
similarity index 68%
copy from smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
copy to smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index 912f1ac..fb7cb2f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -1,33 +1,38 @@
package com.smartor.domain;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
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 java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
- * 鍗曚竴浠诲姟锛堥殢璁匡級瀵硅薄 ivr_taskcall
+ * 鍗曚竴浠诲姟锛堥殢璁匡級瀵硅薄 ivr_tasksingle
*
* @author ruoyi
* @date 2024-02-02
*/
-@ApiModel(value = "ServiceSubtaskVO", description = "鍗曚竴闅忚浠诲姟鍏ュ弬")
+@ApiModel(value = "ServiceSubtask", description = "鍗曚竴闅忚浠诲姟")
@Data
-public class ServiceSubtaskVO extends BaseEntity {
+public class ServiceSubtaskRes extends PatArchive {
private static final long serialVersionUID = 1L;
/**
- *
+ * 涓婚敭
*/
- @ApiModelProperty(value = "涓婚敭id")
- private Long subId;
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+ /**
+ * 浠诲姟ID
+ */
+ @ApiModelProperty(value = "浠诲姟ID")
+ private Long taskid;
/**
* 绗笁鏂逛换鍔D
@@ -36,50 +41,63 @@
private String taskGuid;
/**
- * 闅忚娆℃暟
+ * 鍑洪櫌鐥呬汉璁板綍ID
*/
- @ApiModelProperty(value = "闅忚娆℃暟")
- private Integer visitCount;
+ @ApiModelProperty(value = "鍑洪櫌鐥呬汉璁板綍ID")
+ private Long inhospid;
/**
- * 澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡
+ * 鐖禝D
*/
- @ApiModelProperty(value = "澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡")
- private Integer visitNotice;
+ @Excel(name = "鐖禝D")
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
/**
- * 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄�
+ * 澶囨敞
*/
- @ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�")
- private Integer isVisitAgain;
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
/**
- * 鎮ｈ�匢D
+ * 澶囨敞
*/
- @Excel(name = " 鎮ｈ�匢D")
- @ApiModelProperty(value = "鎮ｈ�匢D")
- private String patguid;
+ @ApiModelProperty(value = "")
+ private String guid;
+
+ /**
+ * 寮傚父鏍囪瘑
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ @Excel(name = " 寮傚父鏍囪瘑:0缁胯壊锛�1绾㈣壊锛�2榛勮壊 ")
+ private String excep;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date starttime;
+
+ /**
+ * 鏄惁鎻愪氦
+ */
+ @ApiModelProperty(value = "鏄惁鎻愪氦锛�0鏈彁浜� 1宸叉彁浜�")
+ private Long submit;
/**
* 鍙戦�佷汉
*/
- @Excel(name = " 鍙戦�佷汉 ")
- @ApiModelProperty(value = "鍙戦�佷汉")
+ @Excel(name = " 鍙戦�佷汉锛堟偅鑰咃級 ")
+ @ApiModelProperty(value = "鍙戦�佷汉锛堟偅鑰咃級")
private String sendname;
-
- /**
- * 鍙戦�乁UID
- */
- @Excel(name = " 鍙戦�乁UID ")
- @ApiModelProperty(value = "鍙戦�乁UID")
- private String senduuid;
-
- /**
- * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
- */
- @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
- @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
- private String suggest;
/**
* 鎵嬫満鍙�
@@ -89,18 +107,18 @@
private String phone;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+ * 鎵嬫満鍙�
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
- private String serviceType;
+ @Excel(name = " 鎵嬫満鍙� ")
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String openid;
/**
* 鎬у埆
*/
@Excel(name = " 鎬у埆")
@ApiModelProperty(value = "鎬у埆")
- private String sex;
+ private Long sex;
/**
* 骞撮緞
@@ -108,13 +126,6 @@
@Excel(name = " 骞撮緞 ")
@ApiModelProperty(value = "骞撮緞")
private Long age;
-
- /**
- * 骞撮緞
- */
- @Excel(name = " 鍑洪櫌鐥呬汉璁板綍ID ")
- @ApiModelProperty(value = "鍑洪櫌鐥呬汉璁板綍ID")
- private Long inhospid;
/**
* 韬唤璇佸彿
@@ -140,19 +151,16 @@
/**
* 浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)
*/
- @Excel(name = "浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)")
- @ApiModelProperty(value = "浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)")
+ @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛屽鏁欙紱 4.閫氱煡)")
private String type;
/**
- * 浠诲姟ID
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)
*/
- @Excel(name = " 浠诲姟ID ")
- @ApiModelProperty(value = "浠诲姟ID")
- private Long taskid;
-
- @ApiModelProperty(value = "浠诲姟Id闆嗗悎")
- private List<Long> taskIds;
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚")
+ private String serviceType;
/**
* 妯℃澘ID
@@ -162,52 +170,18 @@
private Long templateid;
/**
- * 妯℃澘ID
- */
- @Excel(name = " 妯＄増搴撴ā鏉縄D")
- @ApiModelProperty(value = "妯＄増搴撴ā鏉縄D")
- private Long libtemplateid;
-
- /**
- * 妯℃澘ID
- */
- @Excel(name = " 妯℃澘搴撴ā鏉垮悕绉�")
- @ApiModelProperty(value = "妯℃澘搴撴ā鏉垮悕绉�")
- private String libtemplatename;
-
- /**
* 妯℃澘鍚�
*/
@Excel(name = " 妯℃澘鍚� ")
- @ApiModelProperty(value = "妯℃澘鍚�")
+ @ApiModelProperty(value = "鎷夊彇鏃堕棿")
private String templatename;
/**
- * 鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
*/
- @ApiModelProperty(value = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鍗冲埢鍙戦��")
- private String sendType;
-
- /**
- * 鍑洪櫌鏃堕棿
- */
- @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
- private Date inhosptime;
-
- /**
- * 鍖荤敓缂栫爜
- */
- @Excel(name = " 鍖荤敓缂栫爜")
- @ApiModelProperty(value = "鍖荤敓缂栫爜")
- private String drcode;
-
- /**
- * 鍖荤敓濮撳悕
- */
- @Excel(name = " 鍖荤敓濮撳悕")
- @ApiModelProperty(value = "鍖荤敓濮撳悕")
- private String drname;
-
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ private String suggest;
/**
* 鍙戦�佹棩鏈�
@@ -216,6 +190,14 @@
@Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "鍙戦�佹棩鏈�")
private Date senddate;
+
+ /**
+ * 鏂扮殑鍒涘缓鏃堕棿锛堢敤鏉ュ仛鏌ヨ鍙傛暟鐢級
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏂扮殑鍒涘缓鏃堕棿")
+ private Date createTimeNew;
/**
* 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -262,33 +244,37 @@
/**
* 鍙戦�佺姸鎬�
*/
- @Excel(name = " 鍙戦�佺姸鎬� ")
+// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
@ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private Long sendstate;
/**
- * 鍙戦�佺姸鎬�
+ * 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
*/
- @Excel(name = " 鍙戦�佺姸鎬侀泦鍚� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
- private List<Long> sendstates;
+// @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+ @ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
+ private Long stopState;
+ /**
+ * 鍙戦�乁UID
+ */
+// @Excel(name = " 鍙戦�乁UID ")
+ @ApiModelProperty(value = "鍙戦�乁UID")
+ private String senduuid;
/**
* 缁撴灉
*/
- @Excel(name = " 缁撴灉 ")
+// @Excel(name = " 缁撴灉 ")
@ApiModelProperty(value = "缁撴灉")
private String result;
/**
* 瀹屾垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
-
/**
* 灏辫瘖璁板綍缂栧彿
@@ -296,7 +282,6 @@
@Excel(name = " 灏辫瘖璁板綍缂栧彿 ")
@ApiModelProperty(value = "灏辫瘖璁板綍缂栧彿")
private Long recordid;
-
/**
* 褰撳墠閲嶆嫧娆℃暟
@@ -314,31 +299,25 @@
private Date pulltime;
/**
- *
- */
- @Excel(name = " bqsms ")
- @ApiModelProperty(value = "bqsms")
- private Long bqsms;
-
- /**
- * bhsms
- */
- @Excel(name = " bhsms ")
- @ApiModelProperty(value = "bhsms")
- private Long bhsms;
-
- /**
* 閮ㄩ棬code
*/
@Excel(name = " 閮ㄩ棬code")
@ApiModelProperty(value = "閮ㄩ棬code")
private String deptcode;
+
/**
- * 閮ㄩ棬code
+ * 鍖荤敓缂栫爜
*/
- @Excel(name = " 閮ㄩ棬code")
- @ApiModelProperty(value = "閮ㄩ棬code闆嗗悎")
- private List<String> leaveldeptcodes;
+ @Excel(name = " 鍖荤敓缂栫爜")
+ @ApiModelProperty(value = "鍖荤敓缂栫爜")
+ private String drcode;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @Excel(name = " 鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
/**
* 鏍囩鐘舵��
@@ -361,34 +340,6 @@
private Long isupload;
/**
- * 鎮ｈ�匢D
- */
- @Excel(name = "鎮ｈ�匢D")
- @ApiModelProperty(value = "鎮ｈ�匢D")
- private String patientid;
-
- /**
- * 鎮ｈ�呭鍚�
- */
- @Excel(name = "鎮ｈ�呭鍚�")
- @ApiModelProperty(value = "鎮ｈ�呭鍚�")
- private String patientname;
-
- /**
- * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿
- */
- @Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
- @ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
- private Date longSendTime;
-
- /**
- * openid
- */
- @Excel(name = "openid")
- @ApiModelProperty(value = "openid")
- private String openid;
-
- /**
* 涓婁紶鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -404,67 +355,53 @@
private String orgid;
/**
- * 鐖禝D
- */
- @Excel(name = "鐖禝D")
- @ApiModelProperty(value = "鐖禝D")
- private Long pid;
-
- /**
- * GUID
- */
- @Excel(name = "GUID")
- @ApiModelProperty(value = "GUID")
- private String guid;
-
- /**
- * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
- */
- @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
- private Integer isoperation;
-
- /**
* 鏂囨湰鍙橀噺鍙傛暟
*/
@Excel(name = "鏂囨湰鍙橀噺鍙傛暟")
@ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟")
- private Map<String, Map<String, String>> textParam;
-
+ private String textParam;
/**
- * 瀹ｆ暀褰㈠紡 :鏂囨湰銆佸浘鐗囥�佽闊炽�佽棰戙�佹贩鍚�
+ * 瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊
*/
- @Excel(name = " 瀹ｆ暀褰㈠紡 :鏂囨湰銆佸浘鐗囥�佽闊炽�佽棰戙�佹贩鍚�")
- @ApiModelProperty(value = "瀹ｆ暀褰㈠紡 : 1,鏂囨湰銆�2,鍥剧墖銆�3,璇煶銆�4,瑙嗛銆�5,娣峰悎")
+ @Excel(name = " 浠诲姟褰㈠紡 1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ @ApiModelProperty("瀹ｆ暀褰㈠紡 : 浠诲姟褰㈠紡 1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
private String preachform;
/**
* 褰撳墠鍙戦�佹柟寮�
*/
@Excel(name = " 褰撳墠鍙戦�佹柟寮�")
- @ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
+ @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
-
/**
* 搴婂彿
*/
@Excel(name = "搴婂彿")
@ApiModelProperty(value = "搴婂彿")
- private Long bedNo;
+ private String bedNo;
/**
- * 鎮ｈ�匢D
+ * pageNum
*/
- @Excel(name = " 鎮ｈ�匢D")
- @ApiModelProperty(value = "鎮ｈ�匢D")
- private Long patid;
+ @Excel(name = "pageNum")
+ @ApiModelProperty(value = "pageNum")
+ private Integer pageNum;
/**
- * 鍙戦�佹椂闂存
+ * pageSize
*/
- @ApiModelProperty(value = "鍙戦�佹椂闂存 ")
- private List<TaskSendTimeVO> sendTimeslot;
+ @Excel(name = "pageSize")
+ @ApiModelProperty(value = "pageSize")
+ private Integer pageSize;
+
+
+ /**
+ * 鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��
+ */
+ @ApiModelProperty(value = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��")
+ private String sendType;
/**
* 浠诲姟鍚嶇О
@@ -495,7 +432,6 @@
@ApiModelProperty(value = "闅忚浜虹紪鍙�")
private String operatorNo;
-
/**
* 灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�
*/
@@ -506,9 +442,10 @@
/**
* 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
*/
- @Excel(name = " 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾锛�")
- @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾锛�")
+ @Excel(name = " 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�5浣忛櫌銆�7浣撴锛�")
private String hospType;
+
/**
* 寰俊
@@ -517,13 +454,32 @@
@ApiModelProperty(value = "寰俊")
private String wechat;
+ /**
+ * 鍑洪櫌璇婃柇缂栫爜
+ */
+ @Excel(name = " 鍑洪櫌璇婃柇缂栫爜")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇缂栫爜")
+ private String leaveicd10code;
+ /**
+ * 鍑洪櫌璇婃柇鍚嶇О
+ */
+ @Excel(name = " 鍑洪櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇鍚嶇О")
+ private String leavediagname;
/**
- * 璇婃柇鍚嶇О
+ * 鎮ｈ�匢D
*/
- @Excel(name = " 璇婃柇鍚嶇О")
- @ApiModelProperty(value = "璇婃柇鍚嶇О")
- private String diagname;
+ @Excel(name = " 鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = " 鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private String patguid;
/**
* 绉戝鍚嶇О
@@ -531,14 +487,15 @@
@Excel(name = "绉戝鍚嶇О")
@ApiModelProperty(value = "绉戝鍚嶇О")
private String deptname;
-//
-// /**
-// * 灏辫瘖鏃ユ湡
-// */
-// @Excel(name = " 灏辫瘖鏃ユ湡")
-// @ApiModelProperty(value = "灏辫瘖鏃ユ湡")
-// private Date admindate;
-//
+
+ /**
+ * 灏辫瘖鏃ユ湡
+ */
+ @Excel(name = " 灏辫瘖鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "灏辫瘖鏃ユ湡")
+ private Date admindate;
+
/**
* 鐥呮埧鍙�
*/
@@ -547,45 +504,33 @@
private String roomno;
/**
+ * 妯℃澘搴撴ā鐗圛D
+ */
+ @Excel(name = "妯℃澘搴撴ā鐗圛D")
+ @ApiModelProperty(value = "妯℃澘搴撴ā鐗圛D")
+ private Long libtemplateid;
+
+ /**
* 鎬诲垎
*/
@Excel(name = "鎬诲垎")
@ApiModelProperty(value = "鎬诲垎")
- private Long score;
+ private BigDecimal score;
+
+ /**
+ * 妯℃澘搴撴ā鐗堝悕绉�
+ */
+ @Excel(name = "妯℃澘搴撴ā鐗堝悕绉�")
+ @ApiModelProperty(value = "妯℃澘搴撴ā鐗堝悕绉�")
+ private String libtemplatename;
/**
- * 鏄惁鎻愪氦
+ * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿
*/
- @ApiModelProperty(value = "鏄惁鎻愪氦锛�0鏈彁浜� 1宸叉彁浜�")
- private Long submit;
-
-
- /**
- * 鍑洪櫌鐥呭尯缂栧彿
- */
- @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
- private String leavehospitaldistrictcode;
-
- /**
- * 鍑洪櫌鐥呭尯缂栧彿
- */
- @ApiModelProperty(value = "鍑洪櫌鐥呭尯闆嗗悎")
- private List<String> leavehospitaldistrictcodes;
-
- /**
- * 鍑洪櫌鐥呭尯鍚嶇О
- */
- @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
- @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
- private String leavehospitaldistrictname;
-
- /**
- * 璇婃柇鍚嶇О
- */
- @Excel(name = " 绂婚櫌璇婃柇鍚嶇О")
- @ApiModelProperty(value = "绂婚櫌璇婃柇鍚嶇О")
- private String leavediagname;
+ @Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
+ @ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
+ private Date longSendTime;
/**
* 璐ｄ换鎶ゅ＋缂栫爜
@@ -602,47 +547,35 @@
private String nurseName;
/**
- * 寮傚父鏍囪瘑
+ * 鍑洪櫌鐥呭尯缂栧彿
*/
- @ApiModelProperty(value = "寮傚父鏍囪瘑")
- @Excel(name = " 寮傚父鏍囪瘑 ")
- private String excep;
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
/**
- * 澶囨敞
+ * 鍑洪櫌鐥呭尯鍚嶇О
*/
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
/**
- * 鍑洪櫌鏃堕棿
+ * 鍑洪櫌鐥呭尯缂栧彿
*/
- @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date endtime;
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+ private List<String> leavehospitaldistrictcodes;
/**
- * 鍏ラ櫌鏃堕棿
+ * 鍑洪櫌鐥呭尯缂栧彿
*/
- @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date starttime;
+ @ApiModelProperty(value = "鍑洪櫌閮ㄩ棬缂栧彿闆嗗悎")
+ private List<String> leaveldeptcodes;
+ @ApiModelProperty(value = "鍙戦�佽鎯�")
+ private List<ServiceSubtaskRecord> serviceSubtaskRecordList;
- /**
- * pageNum
- */
- @Excel(name = "pageNum")
- @ApiModelProperty(value = "pageNum")
- private Integer pageNum;
-
- /**
- * pageSize
- */
- @Excel(name = "pageSize")
- @ApiModelProperty(value = "pageSize")
- private Integer pageSize;
+ @ApiModelProperty(value = "url")
+ private String url;
/**
* 鎮ｈ�呮潵婧�
@@ -651,65 +584,22 @@
private String patfrom;
/**
- * 缁忕鍖荤敓缂栫爜
+ * 闅忚娆℃暟
*/
- @ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
- private String managementDoctorCode;
+ @ApiModelProperty(value = "闅忚娆℃暟")
+ private Integer visitCount;
/**
- * 缁忕鍖荤敓
+ * 澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡
*/
- @ApiModelProperty(value = "缁忕鍖荤敓")
- private String managementDoctor;
+ @ApiModelProperty(value = "澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡")
+ private Integer visitNotice;
/**
- * 寮�濮嬪嚭闄㈡棩鏈�
+ * 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄�
*/
- @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
- private Date startOutHospTime;
-
- /**
- * 寮�濮嬪彂閫佹棩鏈�
- */
- @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
- private Date startSendDateTime;
-
- /**
- * 缁撴潫鍙戦�佹棩鏈�
- */
- @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
- private Date endSendDateTime;
-
- /**
- * 缁撴潫鍑洪櫌鏃ユ湡
- */
- @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
- private Date endOutHospTime;
-
- /**
- * 绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or
- */
- @ApiModelProperty(value = "绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or ")
- private String deptOrDistrict = "1";
-
- /**
- * 鍒涘缓寮�濮嬫椂闂�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createStartTime;
-
- /**
- * 鍒涘缓缁撴潫鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createEndTime;
-
- /**
- * 鎺掑簭锛堬級
- */
- @ApiModelProperty(value = "鎺掑簭锛�0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭) ")
- private Integer sort;
-
+ @ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�")
+ private Integer isVisitAgain;
/**
* 鎮ｈ�呬笂娆￠殢璁跨殑subId
@@ -718,6 +608,7 @@
private Integer upid;
@ApiModelProperty(value = "闅忚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date visitTime;
/**
@@ -726,32 +617,54 @@
@ApiModelProperty(value = "闅忚鏂瑰紡")
private String visitType;
+
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
private String visitDeptCode;
@ApiModelProperty(value = "闅忚閮ㄩ棬鍚嶇О")
private String visitDeptName;
- @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊;3宸插鐞�")
- private Integer isabnormal;
-
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜闆嗗悎")
private List<String> visitDeptCodes;
/**
- * 鍒嗙粍key
+ * pageNum
*/
- @ApiModelProperty(value = "鍒嗙粍key")
- private String groupKey;
- /**
- * 鍒嗙粍code闆嗗悎
- */
- @ApiModelProperty(value = "鍒嗙粍code闆嗗悎")
- private List<String> groupKeyList;
+ @Excel(name = "pn")
+ @ApiModelProperty(value = "pn")
+ private Integer pn;
-// /**
-// * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
-// */
-// @ApiModelProperty(value = "鏃ユ湡闄愬埗锛�0鍏ㄩ儴鏈嶅姟 1鎴褰撳墠鏃ユ湡")
-// private String dateLimit;
+ /**
+ * pageSize
+ */
+ @Excel(name = "ps")
+ @ApiModelProperty(value = "ps")
+ private Integer ps;
+
+ @ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
+ private String managementDoctorCode;
+
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctor;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶,2鎮ｈ�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6琚繃婊�,7鍏跺畠")
+ private Integer taskSituation;
+
+ @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊; 3宸插鐞�")
+ private Integer isabnormal;
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑")
+ private Integer continueFlag;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private JSONObject continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ private Date continueTimeNext;
}
--
Gitblit v1.9.3