From 2d42d335a0abdabf02601b63b85dda82f5b0781b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 十一月 2026 16:51:05 +0800
Subject: [PATCH] 【丽水】新增再次随访 回院复诊复查 统计

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index d6e708a..3c4a9bf 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -60,6 +60,12 @@
     private String remark;
 
     /**
+     * 鍖荤敓澶勭悊鎰忚
+     */
+    @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+    private String doctorOpinion;
+
+    /**
      * 澶囨敞
      */
     @ApiModelProperty(value = "")
@@ -184,10 +190,10 @@
     private String templatename;
 
     /**
-     * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+     * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID銆�6鍥為櫌澶嶈瘖澶嶆煡
      */
-    @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
-    @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+    @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡 ")
+    @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡")
     private String suggest;
 
     /**
@@ -289,6 +295,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;
 
     /**
      * 灏辫瘖璁板綍缂栧彿
@@ -690,4 +702,11 @@
     @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date continueTimeNext;
+
+    /**
+     * 浜哄伐鐢佃瘽鏍囪
+     */
+    @Excel(name = " 浜哄伐鐢佃瘽鏍囪 ")
+    @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+    private Long isManuallyCalled;
 }

--
Gitblit v1.9.3