From e39d8e5ba5c48b7a978062de796b767037aa9cf9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 十月 2026 16:00:33 +0800
Subject: [PATCH] 【丽水】service_subtask 新增 '医生处理意见' doctor_opinion

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index d49a646..6e60a22 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 = "")
@@ -163,10 +169,10 @@
     private String type;
 
     /**
-     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁�
+     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁�
      */
-    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁縗n")
-    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁縗n")
+    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁縗n")
+    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁縗n")
     private String serviceType;
 
     /**
@@ -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;
 
     /**
      * 灏辫瘖璁板綍缂栧彿
@@ -536,7 +548,7 @@
      */
     @Excel(name = "鎬诲垎")
     @ApiModelProperty(value = "鎬诲垎")
-    private BigDecimal score;
+    private String score;
 
     /**
      * 妯℃澘搴撴ā鐗堝悕绉�
@@ -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