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 | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index ff0f0b8..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,7 @@
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;
@@ -32,6 +33,10 @@
@ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer rateDay;
+ /**
+ * 鏄惁鍐嶆闅忚
+ */
+ @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer isVisitAgain;
@ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
@@ -45,6 +50,14 @@
@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;
@@ -57,7 +70,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;
@@ -117,6 +131,33 @@
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 = "鍒嗙粍绫诲瀷")
@@ -153,6 +194,18 @@
private String excep;
/**
+ * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+ private String suggest;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝ｅ父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+ private Long finishState;
+
+ /**
* 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
*/
@ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
@@ -182,6 +235,42 @@
@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
*/
--
Gitblit v1.9.3