From d44eab2d72314934ef08963863d4b6082056b8ff Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 14:30:14 +0800
Subject: [PATCH] feat: 统一档案随访周期 followupPeriod
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 234 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index 74f92f7..d150385 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -1,6 +1,9 @@
package com.smartor.domain;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,15 +26,37 @@
private Long userId;
private Integer visitCount;
+
+ /**
+ * rateDay 浠ｈ〃鍑犲ぉ鍙婃椂鐜�
+ */
+ @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
+ private Integer rateDay;
+
+ /**
+ * 鏄惁鍐嶆闅忚
+ */
+ @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer isVisitAgain;
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ private Integer isabnormal;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
private Date startTime;
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private Date endTime;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑洪櫌寮�濮嬫椂闂�")
+ private Date hospitalStartTime;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑洪櫌缁撴潫鏃堕棿")
+ private Date hospitalEndTime;
@ApiModelProperty(value = "鏈嶅姟绫诲瀷")
private List<Long> serviceType;
@@ -42,7 +67,11 @@
@ApiModelProperty(value = "绉戝Code闆嗗悎")
private List<String> deptcodes;
- @ApiModelProperty(value = "绉戝鐥呭尯")
+ @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
+ private List<Long> subTaskIds;
+
+ @ApiModelProperty(value = "缁熻缁村害锛�1-鎸夌梾鍖�(leavehospitaldistrictcode) 2-鎸夌瀹�(deptcode) 3-鎸塼askid")
+ @JsonAlias("statisticalType")
private Integer statisticaltype;
private String visitDeptCode;
@@ -51,4 +80,206 @@
@ApiModelProperty(value = "鍖荤敓缂栫爜")
private String drcode;
+ @ApiModelProperty(value = "璇煶鍒嗙被缂栫爜")
+ private Long ivrCategoryid;
+
+ @ApiModelProperty(value = "闂嵎鍒嗙被缂栫爜")
+ private Long svyCategoryid;
+
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶 2锛岄棶鍗凤紱3锛岄�氱煡锛�")
+ private String type;
+
+ @ApiModelProperty(value = "鏌ヨ鍙傛暟 joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+ private String configKey;
+
+ @ApiModelProperty(value = "鏌ヨ鍙傛暟瀵瑰簲鍊� joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+ private String configValue;
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑:1 娌� 2鏈�")
+ private Integer continueFlag;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private JSONObject continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNext;
+
+ /**
+ * 鏈烘瀯缂栫爜
+ */
+ @ApiModelProperty("鏈烘瀯缂栫爜")
+ private String orgid;
+
+ /**
+ * 闄㈠尯缂栫爜
+ */
+ @ApiModelProperty("闄㈠尯缂栫爜")
+ private String campusid;
+
+ /**
+ * 闂缂栫爜-鏌ヨ浣跨敤锛屾敮鎸佸涓棶棰橈紝鐢ㄩ�楀彿鍖哄垎
+ */
+ @ApiModelProperty(value = "闂缂栫爜")
+ private String scriptids;
+
+ /**
+ * 闂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
+ */
+ @ApiModelProperty(value = "鍒嗙粍绫诲瀷")
+ private String groupKeyType;
+
+ /**
+ * 鍒嗙粍key
+ */
+ @ApiModelProperty(value = "鍒嗙粍key")
+ private String groupKey;
+
+ /**
+ * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
+ */
+ @ApiModelProperty(value = "缁熻鏂瑰紡")
+ private String followUpCountStyle;
+
+ /**
+ * 鍒嗙粍code闆嗗悎
+ */
+ @ApiModelProperty(value = "鍒嗙粍code闆嗗悎")
+ private List<String> groupKeyList;
+
+ /**
+ * 鍙戦�佺姸鎬� - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+ private List<Long> sendstates;
+
+ /**
+ * 寮傚父鏍囪瘑 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ private String excep;
+
+ /**
+ * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+ private String suggest;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝ｅ父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+ private Long finishState;
+
+ /**
+ * 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
+ private String currentPreachform;
+
+ /**
+ * 闅忚鎯呭喌 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶,2鎮ｈ�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6琚繃婊�,7鍏跺畠")
+ private Integer taskSituation;
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌绉戝缂栧彿 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝缂栧彿")
+ private String deptcode;
+
+ /**
+ * 瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨� - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨�")
+ private String hyperLinkInfoType;
+
+ @ApiModelProperty(value = "浠诲姟ID", required = true)
+ @JsonAlias("taskid")
+ private Long taskId;
+
+ @ApiModelProperty(value = "taskIds闆嗗悎")
+ private List<Long> taskIds;
+
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ @ApiModelProperty(value = "taskNamee闆嗗悎")
+ private List<String> taskNames;
+
+ @ApiModelProperty(value = "鐤剧梾鐥呯")
+ private String diagType;
+
+ @ApiModelProperty(value = "diagType闆嗗悎")
+ private List<String> diagTypes;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍙戦�佹椂闂�")
+ private Date visittime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌 3.涓撶梾 4.澶栭儴瀵煎叆 5鎬ヨ瘖銆�6浣忛櫌銆�7浣撴锛�")
+ private String hospType;
+
+ /**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
}
--
Gitblit v1.9.3