From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 549acc7..fa030f6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,6 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarCommonReturnDto;
 import com.hz.his.dto.marketing.common.MarketingTotalDto;
 import com.hz.his.dto.user.*;
 import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -136,6 +137,18 @@
     Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
 
     /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖瀹℃牳鍥炶皟
+     */
+    @PostMapping(value = "user/room/doctor/diagnosis")
+    Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖褰撴湀閫氳繃娆℃暟
+     */
+    @PostMapping(value = "user/room/doctor/diagnosis/count")
+    Result diagnosisFamiliesRoomCount(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+    /**
      * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
      */
     @PostMapping(value = "/user/common/approve/create")
@@ -146,4 +159,10 @@
      */
     @PostMapping(value = "/user/arrive/edit")
     Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍛樺伐鑾峰彇鑾峰彇鐭俊鍐呭閾炬帴
+     */
+    @PostMapping(value = "/user/acquisition/get/link")
+    Result getUserAcquisitionLink(@RequestBody UserParamDto userParamDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0