From fc3a12040d6ec88f99c2a4cbe2afb16215ac5ae4 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期三, 13 十二月 2023 10:48:02 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 12 ++++++++++--
1 files changed, 10 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..bd3937d 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,7 +5,7 @@
import java.util.List;
/**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鎶ヨ〃鎵╁睍
* @author fwq
* */
@Data
@@ -24,12 +24,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