Merge branch 'master-prod-new' into chenjiahe-订单积分

chenjiahe

2023-11-14 24a92d0c1fd0a96ccdb1fc5b43aafe7ddd68fa93

Merge branch 'master-prod-new' into chenjiahe-订单积分

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java

@@ -23,4 +23,6 @@
    private Integer isPerformanceEmp;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
    /**类型*/
    private Integer type;
}

 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java

@@ -12,14 +12,15 @@

    /******MarketingDto继承字段 -必填项****/

    /**审核类型 >1000的值 (参考m_application_subject) -必填项*/
    private Integer type;
    /**审核类型唯一字符串  -必填项*/
    private String typeStr;
    /**审核标题  -必填项*/
    private String title;

    /**审核唯一标识 -必填项*/
    private String uniqueId;
    /**审核标题  -必填项*/
    private String title;
    /**审核类型 >1000的值 (参考m_application_subject,不可重复) -必填项*/
    private Integer type;
    /**审核类型唯一字符串*/
    private String typeStr;

    /**审批界面展示的内容 -必填项*/
    private MarketingContentDto marketingContentDto;
@@ -27,7 +28,7 @@
    /**消息发送内容  -必填项*/
    private MarketingMsgDto marketingMsgDto;

    /**回调链接  -必填项  回调传参*/
    /**回调链接  -必填项  回调参数参考MarCommonReturnDto*/
    private String callbackUrl;

}

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java

@@ -30,6 +30,8 @@
    private String platformType;
    /** 操作人角色id(EmployeeRole) */
    private String opRoleId;
    /** 到访订单id */
    private String visitOrderId;

    private List<MicroPlanDto> planList;
}

 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java

New file
@@ -0,0 +1,31 @@
package com.hz.his.dto.user.room;

import lombok.Data;

import java.util.List;

/**
 * 用户科室关系转换使用
 * code_no_data
 * */
@Data
public class UserDoctorRoomDto {
    /**点诊类型*/
    private Integer type;
    /**用户标识*/
    private String userId;
    /**备注*/
    private String operatorRemark;
    /**科室关系Json*/
    private List<UserDoctorRoomItemDto> roomList;

    /**操作人信息*/
    private String opId;
    private String opName;
    private String opShopId;
    private String opShopName;
    private String opRoleId;
    private String opRoleTypeId;
    private String opRoleStr;

}

 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.dto.user.room;

import lombok.Data;

/**
 * 用户科室关系转换使用
 * code_no_data
 * */
@Data
public class UserDoctorRoomItemDto {
    /**标识*/
    private String id;
    private Integer isDel;
    /**科室*/
    private String familiesRoomId;
    /**科室名称*/
    private String familiesRoomName;
    /**顾问*/
    private String adviserId;
    /**顾问名称*/
    private String adviserName;
    /**医生*/
    private String doctorId;
    /**医生名称*/
    private String doctorName;
    /**护士*/
    private String nurseId;
    /**护士名称*/
    private String nurseName;
}

 phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java

@@ -16,7 +16,7 @@
     * 统一申请审核接口
     */
    @PostMapping(value = "/common/apply")
    Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
    Result commonApply(@RequestBody MarketingTotalDto marketingTotalDto);




 phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SVisitOrderService.java

New file
@@ -0,0 +1,20 @@
package com.hz.his.feign.service.phisAdmin;

import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentDto;
import com.hz.his.dto.treat.TreatAfterVideoDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

/**
 * mot扫码到访
 */
@FeignClient(name="phis-service",contextId = "phis-visit-order")
public interface SVisitOrderService {
    /**
     * mot扫码到访
     */
    @RequestMapping("/visit/order/mot/scanCode")
    Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

@@ -1,9 +1,11 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
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 +128,16 @@
     */
    @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/common/approve/create")
    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
}