From 34f78281cf395a24e1f3f1c3b861186ff8a03b7b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 11:09:40 +0800
Subject: [PATCH] 出入院模块、门急诊模块、模块模块、宣教模块、其它模块
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 158 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index 0d3f6b3..37725ca 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -1,11 +1,13 @@
package com.smartor.domain;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -25,18 +27,36 @@
private Integer visitCount;
+ /**
+ * rateDay 浠ｈ〃鍑犲ぉ鍙婃椂鐜�
+ */
+ @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
+ private Integer rateDay;
+
+ /**
+ * 鏄惁鍐嶆闅忚
+ */
+ @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer isVisitAgain;
@ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
private Integer isabnormal;
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @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;
@@ -50,7 +70,7 @@
@ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
private List<Long> subTaskIds;
- @ApiModelProperty(value = "绉戝鐥呭尯")
+ @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁� 2锛岀瀹ょ粺璁� 3. 鐥呯缁熻")
private Integer statisticaltype;
private String visitDeptCode;
@@ -74,6 +94,23 @@
@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;
+
/**
* 鏈烘瀯缂栫爜
*/
@@ -93,6 +130,122 @@
private String scriptids;
/**
+ * 鎶� scriptids锛堥�楀彿鍒嗛殧鐨勯棶棰業D瀛楃涓诧級涓ユ牸瑙ｆ瀽涓� Long 闆嗗悎锛屼粎渚� SQL 鐨� foreach 棰勭紪璇戜娇鐢ㄣ��
+ * <p>
+ * 鍙繚鐣欑函鏁板瓧椤癸紝鍏朵綑鍐呭涓�寰嬩涪寮冿紝杩斿洖 null 琛ㄧず鈥滀笉杩囨护鈥濄��
+ * 杩欐牱 scriptids 杩欎釜璇锋眰瀛楁姘歌繙涓嶄細琚嫾鎺ヨ繘 SQL锛岄伩鍏嶆敞鍏ワ紙鍘熷疄鐜版槸 in (${scriptids})锛夈��
+ */
+ @JsonIgnore
+ public List<Long> getScriptidList() {
+ if (scriptids == null || scriptids.trim().isEmpty()) {
+ return null;
+ }
+ List<Long> scriptidList = new ArrayList<>();
+ for (String item : scriptids.split(",")) {
+ String scriptid = item.trim();
+ if (scriptid.matches("\\d+")) {
+ scriptidList.add(Long.valueOf(scriptid));
+ }
+ }
+ return scriptidList.isEmpty() ? null : scriptidList;
+ }
+
+ /**
+ * 鍒嗙粍绫诲瀷 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("褰撳墠鍙戦�佹柟寮�")
+ 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)
+ 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;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
@@ -103,4 +256,4 @@
*/
@ApiModelProperty("pageSize")
private Integer pageSize;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3