From 569e8be78cc357147a403daa1af8dfe6dd7d5308 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 18 八月 2026 18:22:10 +0800
Subject: [PATCH] 1.处理药品宣教的问题 2.处理南华满意度的功能 3.处理随访导出的问题 4.处理南华短信的问题

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

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index e7ba287..171780e 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -451,7 +451,7 @@
      * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖  2鍑洪櫌锛�
      */
     @Excel(name = "  灏辫瘖绫诲瀷锛�1闂ㄨ瘖  2鍑洪櫌锛�")
-    @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖  2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴锛�")
+    @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖  2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴銆�8鎵爜锛�")
     private String hospType;
 
 
@@ -474,6 +474,13 @@
     @Excel(name = "  鍑洪櫌璇婃柇鍚嶇О")
     @ApiModelProperty(value = "鍑洪櫌璇婃柇鍚嶇О")
     private String leavediagname;
+
+    /**
+     * 鍏ラ櫌璇婃柇鍚嶇О
+     */
+    @Excel(name = "  鍏ラ櫌璇婃柇鍚嶇О")
+    @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
+    private String diagname;
 
     /**
      * 鎮h�匢D
@@ -523,7 +530,7 @@
      */
     @Excel(name = "鎬诲垎")
     @ApiModelProperty(value = "鎬诲垎")
-    private BigDecimal score;
+    private String score;
 
     /**
      * 妯℃澘搴撴ā鐗堝悕绉�
@@ -687,4 +694,58 @@
     @ApiModelProperty(value = "鐤剧梾鐥呯")
     @Excel(name = " 鐤剧梾鐥呯")
     private String diagType;
+
+    /**
+     * 寮�濮嬪嚭闄㈡棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
+    private Date startOutHospTime;
+
+    /**
+     * 缁撴潫鍑洪櫌鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
+    private Date endOutHospTime;
+
+    /**
+     * 寮�濮嬪彂閫佹棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
+    private Date startSendDateTime;
+
+    /**
+     * 缁撴潫鍙戦�佹棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
+    private Date endSendDateTime;
+
+    // ===================== 浠诲姟缁勶紙appltype=5锛夊洖婧瓧娈� =====================
+
+    /**
+     * 鍏宠仈 service_task_schedule.id锛坅ppltype=5 鏃朵娇鐢級
+     */
+    @ApiModelProperty(value = "鍏宠仈 service_task_schedule.id锛坅ppltype=5锛�")
+    private Long scheduleId;
+
+    /**
+     * 鍏宠仈 service_task_schedule_detail.id
+     */
+    @ApiModelProperty(value = "鍏宠仈 service_task_schedule_detail.id")
+    private Long scheduleDetailId;
+
+    /**
+     * 鏈潯 subtask 鍦ㄨ鍒掍腑鐨勯『搴忓彿
+     */
+    @ApiModelProperty(value = "鏈潯 subtask 鍦ㄨ鍒掍腑鐨勯『搴忓彿")
+    private Integer scheduleSeq;
+
+    /**
+     * 鎵�鍦ㄥ惊鐜疆娆★紙闈炲惊鐜换鍔′负0锛�
+     */
+    @ApiModelProperty(value = "鎵�鍦ㄥ惊鐜疆娆★紙闈炲惊鐜换鍔′负0锛�")
+    private Long loopCount;
 }

--
Gitblit v1.9.3