From 607dd05591843f0691a3e38fbb2c790a99c13f09 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 12 十月 2023 15:38:59 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java |   47 +++++++++++++++++++++++++++++++++++------------
 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java                  |    4 ++++
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index a7127cf..940b97c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -22,6 +22,10 @@
     private List<String> employeeIdList;
     /**闂ㄥ簵鏍囪瘑闆嗗悎*/
     private List<String> shopIdList;
+    /**鐢ㄦ埛鐘舵��*/
+    List<String> userStatusList;
+    /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+    Integer selectVip;
     /**褰撳墠鏃堕棿*/
     private String nowTime;
     /**寮�濮嬫椂闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index cb348d7..a72b3ee 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -52,7 +52,42 @@
     @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
     Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**
+     * 娌荤枟鏍囩浼氬憳鏁伴噺
+     */
+    @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+    Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
 
+
+    /**
+     * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+     */
+    @PostMapping("/admin/doctor/sale/report/treat/detail/list")
+    Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 閲嶇偣鍝侀」鏁版嵁
+     */
+    @PostMapping("/admin/doctor/sale/report/project/items/list")
+    Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍒嗙被娌荤枟娓楅�忔儏鍐�
+     */
+    @PostMapping("/admin/doctor/sale/report/type/permeate/list")
+    Result typePermeateList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鎵ц椤圭洰-鑱斿悎澶氶」鎯呭喌
+     */
+    @PostMapping("/admin/doctor/sale/report/project/therapy/multiple")
+    Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+
+
+    /*******************************涓嬮潰鎺ュ彛2.0搴熷純*********************************/
     /**
      * 鎵ц閮ㄤ綅
      */
@@ -76,18 +111,6 @@
      */
     @PostMapping("/admin/doctor/sale/report/loss/project/market/list")
     Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);
-
-    /**
-     * 娌荤枟鏍囩浼氬憳鏁伴噺
-     */
-    @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
-    Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
-
-
-
-
-
-
 
     /**
      * 鎵ц椤圭洰-SPU鍗犳瘮

--
Gitblit v1.8.0