From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index 3e14371..f223034 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -3,6 +3,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 璇婃墍鐜伴噾涓氱哗VO
  * @USER: fhx
@@ -11,14 +13,26 @@
 @Data
 public class ClinicPerfReqDto extends BaseQueryVo{
 
-    //闂ㄥ簵id
+    /** 鎵�灞為棬搴梚d */
     private String shopId;
-    //寮�濮嬫椂闂�
+    /** 璁㈠崟闂ㄥ簵 */
+    private String orderShopId;
+    /** 鏀堕摱闂ㄥ簵*/
+    private String cashierShopId;
+    /** 寮�濮嬫椂闂� */
     private String startTime;
-    //缁撴潫鏃堕棿
+    /** 缁撴潫鏃堕棿 */
     private String endTime;
-    //鍏抽敭璇�(鐢ㄦ埛鍚�/CIQ)
+    /** 鍏抽敭璇�(鐢ㄦ埛鍚�/CIQ) */
     private String keyWord;
-    //璁㈠崟鍙�
+    /** 璁㈠崟鍙� */
     private String orderNo;
+    /** 鎿嶄綔浜烘爣璇� */
+    private String operatorId;
+    /** 鎿嶄綔浜� */
+    private String operatorName;
+    /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+    private Integer isFilterTestAccount;
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
 }

--
Gitblit v1.8.0