From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index dd22a49..04e5f53 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -5,11 +5,15 @@
import java.util.List;
/**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鎶ヨ〃鎵╁睍
* @author fwq
* */
@Data
public class UserReportDto {
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+
/**杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
/**鍛樺伐鏍囪瘑*/
@@ -24,12 +28,20 @@
private List<String> roomList;
/**鍖荤敓鏍囪瘑*/
private List<String> doctorIdList;
+ /**娉ㄥ皠绉戝尰鐢熸爣璇�*/
+ private List<String> zskDoctorIdList;
+ /**鐨偆绉戝尰鐢熸爣璇�*/
+ private List<String> pfkDoctorIdList;
/**浼氬憳绛夌骇*/
private List<String> userLevelList;
/**浼氬憳鐘舵��*/
private List<String> userStatusList;
/**澧為暱涓績鏄犲皠椤圭洰*/
- private List<String> upProjectIdList;
+ private List<String> upProjectNameList;
/**椤鹃棶鏍囪瘑*/
private List<String> adviserIdList;
+ /**鏍囩*/
+ private List<String> tagNameList;
+ /**鎵ц棰戞,1,2,3(-1涓哄娆�)*/
+ private Integer deductionNum;
}
--
Gitblit v1.8.0