From a1d7878bc5e76eccce087f758fc3b3e1f1cf5af3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 17:05:29 +0800
Subject: [PATCH] 随访类型更新
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
index 1dc4a6a..9204983 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
@@ -1,6 +1,7 @@
package com.ruoyi.task.domain;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
@@ -79,7 +80,8 @@
@ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
private List<Long> subTaskIds;
- @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁� 2锛岀瀹ょ粺璁� 3. 鐥呯缁熻")
+ @ApiModelProperty(value = "缁熻缁村害锛�1-鎸夌梾鍖�(leavehospitaldistrictcode) 2-鎸夌瀹�(deptcode) 3-鎸塼askid")
+ @JsonAlias("statisticalType")
private Integer statisticaltype;
private String visitDeptCode;
@@ -139,6 +141,7 @@
private String scriptids;
/**
+ /**
* 鎶� scriptids锛堥�楀彿鍒嗛殧鐨勯棶棰業D瀛楃涓诧級涓ユ牸瑙ｆ瀽涓� Long 闆嗗悎锛屼粎渚� SQL 鐨� foreach 棰勭紪璇戜娇鐢ㄣ��
* <p>
* 鍙繚鐣欑函鏁板瓧椤癸紝鍏朵綑鍐呭涓�寰嬩涪寮冿紝杩斿洖 null 琛ㄧず鈥滀笉杩囨护鈥濄��
@@ -158,6 +161,33 @@
}
return scriptidList.isEmpty() ? null : scriptidList;
}
+
+ /**
+ * 闂ID锛堥鐩槑缁嗚杩斿洖鐨� scriptid锛夛紝鐢ㄤ簬閫夐」鏁板瓧涓嬮捇
+ */
+ @ApiModelProperty(value = "闂ID")
+ @JsonAlias("scriptId")
+ private Long scriptid;
+
+ /**
+ * 闂鍐呭銆備紶鍏ュ悗鎸夐鐩唴瀹瑰尮閰嶏紝鍏煎鍚屼竴閬撻琚鍒跺埌澶氫釜浠诲姟妯℃澘鐨勫満鏅�
+ */
+ @ApiModelProperty(value = "闂鍐呭")
+ private String scriptContent;
+
+ /**
+ * 閫夐」鏂囨湰锛堥鐩槑缁嗚杩斿洖鐨� optionText锛�
+ */
+ @ApiModelProperty(value = "閫夐」鏂囨湰")
+ @JsonAlias({"optiontext", "option", "optionContent"})
+ private String optionText;
+
+ /**
+ * 棰樼洰鏄庣粏涓殑浠诲姟绫诲瀷锛坰ubtaskType锛夛紝鐢ㄤ簬涓嬮捇鏃跺尯鍒嗚闊�/闂嵎
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛堥鐩槑缁嗕腑鐨� subtaskType锛�")
+ @JsonAlias("subTaskType")
+ private String subtaskType;
/**
* 鍒嗙粍绫诲瀷 drCode, deptCode, leaveHospitalDistrictCode
@@ -238,6 +268,18 @@
private String excep;
/**
+ * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+ private String suggest;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝ｅ父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+ private Long finishState;
+
+ /**
* 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
*/
@ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
@@ -268,6 +310,7 @@
private String hyperLinkInfoType;
@ApiModelProperty(value = "浠诲姟ID", required = true)
+ @JsonAlias("taskid")
private Long taskId;
@ApiModelProperty(value = "taskIds闆嗗悎")
@@ -297,6 +340,12 @@
private String hospType;
/**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
--
Gitblit v1.9.3