From 0e811615b93c04188ba520b2ba6b89b0d186f80b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 一月 2026 20:12:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 3b15a25..912f1ac 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -151,6 +151,9 @@
@ApiModelProperty(value = "浠诲姟ID")
private Long taskid;
+ @ApiModelProperty(value = "浠诲姟Id闆嗗悎")
+ private List<Long> taskIds;
+
/**
* 妯℃澘ID
*/
@@ -648,13 +651,13 @@
private String patfrom;
/**
- * 鎮ｈ�呮潵婧�
+ * 缁忕鍖荤敓缂栫爜
*/
@ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
private String managementDoctorCode;
/**
- * 鎮ｈ�呮潵婧�
+ * 缁忕鍖荤敓
*/
@ApiModelProperty(value = "缁忕鍖荤敓")
private String managementDoctor;
@@ -729,6 +732,26 @@
@ApiModelProperty(value = "闅忚閮ㄩ棬鍚嶇О")
private String visitDeptName;
+ @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊;3宸插鐞�")
+ private Integer isabnormal;
+
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜闆嗗悎")
private List<String> visitDeptCodes;
+
+ /**
+ * 鍒嗙粍key
+ */
+ @ApiModelProperty(value = "鍒嗙粍key")
+ private String groupKey;
+ /**
+ * 鍒嗙粍code闆嗗悎
+ */
+ @ApiModelProperty(value = "鍒嗙粍code闆嗗悎")
+ private List<String> groupKeyList;
+
+// /**
+// * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
+// */
+// @ApiModelProperty(value = "鏃ユ湡闄愬埗锛�0鍏ㄩ儴鏈嶅姟 1鎴褰撳墠鏃ユ湡")
+// private String dateLimit;
}
--
Gitblit v1.9.3