From fd12c3a4d5c0a247c89ab59faba189075a302ffd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 09 六月 2025 18:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 11061da..97c62ff 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -234,28 +234,28 @@
     /**
      * 鍙戦�佺姸鎬�
      */
-    @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+//    @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
     @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴�")
     private Long sendstate;
 
     /**
      * 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
      */
-    @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+//    @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
     @ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
     private Long stopState;
 
     /**
      * 鍙戦�乁UID
      */
-    @Excel(name = " 鍙戦�乁UID ")
+//    @Excel(name = " 鍙戦�乁UID ")
     @ApiModelProperty(value = "鍙戦�乁UID")
     private String senduuid;
 
     /**
      * 缁撴灉
      */
-    @Excel(name = " 缁撴灉 ")
+//    @Excel(name = " 缁撴灉 ")
     @ApiModelProperty(value = "缁撴灉")
     private String result;
 
@@ -566,12 +566,41 @@
     @ApiModelProperty(value = "鎮h�呮潵婧愶細0鏈湴鎮h�呰〃    1澶栭儴鎮h�呰〃")
     private String patfrom;
 
+    /**
+     * 闅忚娆℃暟
+     */
+    @ApiModelProperty(value = "闅忚娆℃暟")
+    private Integer visitCount;
 
-    @ApiModelProperty(value = "鍑洪櫌銆侀棬璇婃搷浣滀汉")
-    private String hospOperator;
+    /**
+     * 鏄惁鍦ㄦ闅忚锛�1鍚�    2鏄�
+     */
+    @ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄�    2鍚�")
+    private Integer isVisitAgain;
 
-    @ApiModelProperty(value = "鍑洪櫌銆侀棬璇婃搷浣滀汉ID")
-    private String hospOperatorId;
+    /**
+     * 鎮h�呬笂娆¢殢璁跨殑subId
+     */
+    @ApiModelProperty(value = "鎮h�呬笂娆¢殢璁跨殑subId")
+    private Integer upid;
+
+    @ApiModelProperty(value = "闅忚鏃堕棿")
+    private Date visitTime;
+
+    /**
+     * 闅忚鏂瑰紡
+     */
+    @ApiModelProperty(value = "闅忚鏂瑰紡")
+    private String visitType;
 
 
+
+    @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
+    private String visitDeptCode;
+
+    @ApiModelProperty(value = "闅忚閮ㄩ棬鍚嶇О")
+    private String visitDeptName;
+
+    @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜闆嗗悎")
+    private List<String> visitDeptCodes;
 }

--
Gitblit v1.9.3