From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 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 5ce66dd..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;
@@ -61,16 +62,26 @@
@ApiModelProperty(value = "鏈嶅姟绫诲瀷")
private List<Long> serviceType;
- @ApiModelProperty(value = "鐥呭尯Code闆嗗悎")
+ @ApiModelProperty(value = "绂婚櫌鐥呭尯Code闆嗗悎")
private List<String> leavehospitaldistrictcodes;
+
+ @ApiModelProperty(value = "绂婚櫌绉戝Code闆嗗悎")
+ private List<String> leaveldeptcodes;
@ApiModelProperty(value = "绉戝Code闆嗗悎")
private List<String> deptcodes;
+ @ApiModelProperty(value = "鐥呭尯Code闆嗗悎")
+ private List<String> hospitaldistrictcodes;
+
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝Code闆嗗悎")
+ private List<String> hospitaldeptcodes;
+
@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;
@@ -130,6 +141,7 @@
private String scriptids;
/**
+ /**
* 鎶� scriptids锛堥�楀彿鍒嗛殧鐨勯棶棰業D瀛楃涓诧級涓ユ牸瑙ｆ瀽涓� Long 闆嗗悎锛屼粎渚� SQL 鐨� foreach 棰勭紪璇戜娇鐢ㄣ��
* <p>
* 鍙繚鐣欑函鏁板瓧椤癸紝鍏朵綑鍐呭涓�寰嬩涪寮冿紝杩斿洖 null 琛ㄧず鈥滀笉杩囨护鈥濄��
@@ -151,16 +163,85 @@
}
/**
+ * 闂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;
/**
+ * 瀹為檯鐢ㄤ簬鈥滅粨鏋滃垎缁勨�濈殑鍒楀悕锛堜粎鏈嶅姟绔唴閮ㄤ娇鐢紝涓嶄粠璇锋眰浼犲叆锛夈��
+ * <p>
+ * 鍘嗗彶鍘熷洜锛歿@link #groupKey} 鏃㈢敤浜� getSfStatistics 鐨� {@code AND ${groupKey} IN (...)} 杩囨护锛�
+ * 鍙堣褰撴垚鍒嗙粍鍒楋紱浣� {@code groupKey = 'deptcode'} 鏃讹紝鍘熷疄鐜版槸鍦ㄥ唴瀛橀噷鎸�
+ * {@code leaveldeptcode} 鍒嗙粍鐨勶紝杩囨护鍒椾笌鍒嗙粍鍒楀苟涓嶇浉鍚屻��
+ * 涓轰簡鎶婄疮鍔犱笅鎺ㄥ埌鏁版嵁搴撳悗鍙ｅ緞涓嶅彉锛岃繖閲屾妸涓や欢浜嬫媶寮�锛歡roupKey 璐熻矗杩囨护锛実roupColumn 璐熻矗鍒嗙粍銆�
+ */
+ @JsonIgnore
+ private String groupColumn;
+
+ /**
* 鍒嗙粍key
*/
@ApiModelProperty(value = "鍒嗙粍key")
private String groupKey;
+
+ /**
+ * 鐥呭尯缁熻锛堢闄㈢淮搴︼級瀹為檯浣跨敤鐨勨�滄湁鏁堢梾鍖衡�濆垪琛ㄨ揪寮忥紙浠呮湇鍔＄鍐呴儴浣跨敤锛夈��
+ * <p>
+ * 婊℃剰搴﹀瓙浠诲姟锛坰ervice_type 6/14/15/16锛夌殑 {@code leavehospitaldistrictcode} 绾︿笁鎴愪负绌猴紝
+ * 鏃у啓娉曟妸绌哄�煎綋鎴愨�滀笉闄愨�濇斁琛岋紙{@code xxx IS NULL OR xxx IN (...)}锛夛紝
+ * 缁撴灉閫変腑 A 鐥呭尯鏃朵細鎶婄┖鐥呭尯鐨勮褰曞叏甯﹁繘鏉ワ紝鍐嶆寜
+ * {@code IFNULL(leavehospitaldistrictcode,'Unknown')} 褰掓垚涓�涓粍锛�
+ * 杩欎竴缁勭殑鐥呭尯鍚嶅張鏄� {@code MAX(hospitaldistrictname)} 闅忎究鎸戠殑銆�
+ * <p>
+ * 杩欓噷缁欏嚭鈥滃嚭闄㈢梾鍖轰负绌哄垯鍥為��鍒板湪闄㈢梾鍖衡�濈殑琛ㄨ揪寮忥紝杩囨护涓庡垎缁勯兘鏀圭敤瀹冿紝
+ * 绌虹梾鍖虹殑璁板綍鍥犳鍥炲埌瀹冪湡姝ｇ殑鍦ㄩ櫌鐥呭尯锛岃�屼笉鏄薄鏌撶敤鎴烽�変腑鐨勭梾鍖恒��
+ * 涓� null 鏃朵繚鎸佸巻鍙茶涓猴紙鍏煎鍏跺畠璋冪敤鏂癸級銆�
+ */
+ @JsonIgnore
+ private String districtColumn;
+
+ /**
+ * 鍒嗛〉鍋忕Щ閲忥紙浠呮湇鍔＄鍐呴儴浣跨敤锛夈��
+ * <p>
+ * pageNum 鏄� 1 璧峰鐨勶紝鑰屽巻鍙插啓娉曠洿鎺ユ妸瀹冨綋 SQL 鐨� OFFSET 鐢�
+ * 锛坽@code limit 20 OFFSET 1}锛夛紝绗竴椤典細鍑┖璺虫帀绗竴鏉″垎缁勬暟鎹��
+ */
+ @JsonIgnore
+ public Integer getPageOffset() {
+ if (pageSize == null) {
+ return null;
+ }
+ int current = (pageNum == null || pageNum < 1) ? 1 : pageNum;
+ return (current - 1) * pageSize;
+ }
/**
* 闅忚缁熻鏂瑰紡 1-榛樿缁熻鏂瑰紡 2-缁熻鏃剁畻涓婁笉鍙戦�佺殑 3-鍙粺璁″凡瀹屾垚鐨�
@@ -185,6 +266,18 @@
*/
@ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
private String excep;
+
+ /**
+ * 澶勭悊鎰忚缂栫爜 - 瓒呴摼鎺ョ粺璁�
+ */
+ @ApiModelProperty(value = "澶勭悊鎰忚缂栫爜")
+ private String suggest;
+
+ /**
+ * 瀹屾垚鏃剁姸鎬� - 瓒呴摼鎺ョ粺璁★紙1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛�
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1姝ｅ父瀹屾垚 2寤舵湡瀹屾垚 3瓒呮椂瀹屾垚")
+ private Long finishState;
/**
* 褰撳墠鍙戦�佹柟寮� - 瓒呴摼鎺ョ粺璁�
@@ -217,6 +310,7 @@
private String hyperLinkInfoType;
@ApiModelProperty(value = "浠诲姟ID", required = true)
+ @JsonAlias("taskid")
private Long taskId;
@ApiModelProperty(value = "taskIds闆嗗悎")
@@ -246,6 +340,12 @@
private String hospType;
/**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
--
Gitblit v1.9.3