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 | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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 b085309..37725ca 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -2,11 +2,12 @@
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;
@@ -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,7 @@
@ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
private List<Long> subTaskIds;
- @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁� 2锛岀瀹ょ粺璁�")
+ @ApiModelProperty(value = "绉戝鐥呭尯锛�1锛岀梾鍖虹粺璁� 2锛岀瀹ょ粺璁� 3. 鐥呯缁熻")
private Integer statisticaltype;
private String visitDeptCode;
@@ -117,6 +130,27 @@
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 = "鍒嗙粍绫诲瀷")
@@ -129,7 +163,7 @@
private String groupKey;
/**
- * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑
+ * 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
*/
@ApiModelProperty(value = "缁熻鏂瑰紡")
private String followUpCountStyle;
@@ -182,6 +216,35 @@
@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
*/
--
Gitblit v1.9.3