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

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 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 ad56d0c..3353622 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,9 +1,12 @@
 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;
 import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
 import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -126,4 +129,34 @@
      */
     @PostMapping(value = "/user/acquisition/list")
     Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖鏂板
+     */
+    @PostMapping(value = "/user/room/doctor/diagnosis/create")
+    Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖瀹℃牳鍥炶皟
+     */
+    @PostMapping(value = "user/room/doctor/diagnosis")
+    Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
+     */
+    @PostMapping(value = "/user/common/approve/create")
+    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
+
+    /**
+     * 鍒拌鏇存柊鐢ㄦ埛淇℃伅
+     */
+    @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