Merge branch 'master-prod-new' into master-test

fwq

2024-05-09 17c959c9ba3966d251ccc555f1215175fdccdf97

 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);
}