From 0f22f66ae9d2156b983f533beb17a0062a949524 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 26 十月 2025 20:46:28 +0800
Subject: [PATCH] Merge branch 'master' into 1027-master
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 4b7783d..518cdf7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -42,6 +42,12 @@
private Integer visitCount;
/**
+ * 澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡
+ */
+ @ApiModelProperty(value = "澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡")
+ private Integer visitNotice;
+
+ /**
* 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄�
*/
@ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�")
@@ -254,14 +260,14 @@
* 鍙戦�佺姸鎬�
*/
@Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� : 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private Long sendstate;
/**
* 鍙戦�佺姸鎬�
*/
@Excel(name = " 鍙戦�佺姸鎬侀泦鍚� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� : 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private List<Long> sendstates;
@@ -429,6 +435,13 @@
@ApiModelProperty(value = "瀹ｆ暀褰㈠紡 : 1,鏂囨湰銆�2,鍥剧墖銆�3,璇煶銆�4,瑙嗛銆�5,娣峰悎")
private String preachform;
+ /**
+ * 褰撳墠鍙戦�佹柟寮�
+ */
+ @Excel(name = " 褰撳墠鍙戦�佹柟寮�")
+ @ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
+ private String currentPreachform;
+
/**
* 搴婂彿
@@ -564,6 +577,12 @@
@Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
private String leavehospitaldistrictname;
+ /**
+ * 璇婃柇鍚嶇О
+ */
+ @Excel(name = " 绂婚櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "绂婚櫌璇婃柇鍚嶇О")
+ private String leavediagname;
/**
* 璐ｄ换鎶ゅ＋缂栫爜
@@ -597,12 +616,14 @@
* 鍑洪櫌鏃堕棿
*/
@ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endtime;
/**
* 鍏ラ櫌鏃堕棿
*/
@ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date starttime;
@@ -627,6 +648,18 @@
private String patfrom;
/**
+ * 缁忕鍖荤敓缂栫爜
+ */
+ @ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
+ private String managementDoctorCode;
+
+ /**
+ * 缁忕鍖荤敓
+ */
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctor;
+
+ /**
* 寮�濮嬪嚭闄㈡棩鏈�
*/
@ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
@@ -648,6 +681,7 @@
* 缁撴潫鍑洪櫌鏃ユ湡
*/
@ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endOutHospTime;
/**
@@ -689,7 +723,7 @@
*/
@ApiModelProperty(value = "闅忚鏂瑰紡")
private String visitType;
-
+
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
private String visitDeptCode;
--
Gitblit v1.9.3