From 9104e047e7ef7c4504bd548711b8fdeda3abd621 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 28 十月 2026 10:50:56 +0800
Subject: [PATCH] 【丽水】collectUser 修正

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

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index d2801da..8a4f392 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -185,6 +185,13 @@
     private String suggest;
 
     /**
+     * 鍖荤敓澶勭悊鎰忚
+     */
+    @Excel(name = "鍖荤敓澶勭悊鎰忚")
+    @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+    private String doctorOpinion;
+
+    /**
      * 鍙戦�佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -275,6 +282,12 @@
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "瀹屾垚鏃堕棿")
     private Date finishtime;
+
+    /**
+     * 瀹屾垚鏃剁姸鎬侊細1-姝e父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚
+     */
+    @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1-姝e父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚")
+    private Long finishState;
 
     /**
      * 灏辫瘖璁板綍缂栧彿
@@ -746,4 +759,17 @@
      */
     @ApiModelProperty(value = "鎵�鍦ㄥ惊鐜疆娆★紙闈炲惊鐜换鍔′负0锛�")
     private Long loopCount;
+
+    /**
+     * 浜哄伐鐢佃瘽鏍囪
+     */
+    @Excel(name = " 浜哄伐鐢佃瘽鏍囪 ")
+    @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+    private Long isManuallyCalled;
+
+    /**
+     * 鍐嶆闅忚鏂瑰紡锛堜粎鎺ュ彛璇锋眰鍙傛暟锛屼笉钀藉簱锛�
+     */
+    @ApiModelProperty(value = "鍐嶆闅忚鏂瑰紡 1-鏈瀹ら殢璁� 2-闅忚涓績闅忚锛堜粎璇锋眰鍙傛暟锛屼笉钀藉簱锛�")
+    private String resource;
 }

--
Gitblit v1.9.3