Merge remote-tracking branch 'origin/fhx-base-医助需求1008' into master-test

fhx

2024-10-10 01e3bc6ab8919b4284e43fbbb1be57291deac943

Merge remote-tracking branch 'origin/fhx-base-医助需求1008' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
#	phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
#	phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
#	phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java

@@ -58,5 +58,7 @@

    /** 是否当天分隔上下午匹配(默认false) */
    private boolean isDaySpace = false;
    /** 推荐匹配数量(默认2) */
    private Integer mateNum;

}

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java

@@ -33,4 +33,6 @@
    private List preOrderItems;
    //spa预约标识
    private String id;
    //SPU标识
    private String spuId;
}

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java

@@ -2,8 +2,6 @@

import lombok.Data;

import java.util.Date;

/**
 * 预约V2版dto
 * @USER: fhx
@@ -75,6 +73,8 @@
    private String remark;
    /** 餐食备注 */
    private String mealsRemark;
    /** 预约冲突原因 */
    private String conflictReason;

    /** 预约项目json字符串 */
    private String projectJson;

 phis-feign/src/main/java/com/hz/his/dto/role/SysCommonRoleDto.java

@@ -18,6 +18,9 @@
    /**是否启用*/
    private Integer isUse;

    /** 权限类型(SysAdminAuthorityGroup) */
    private Integer isNew;

    public SysCommonRoleDto() {
    }
}

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

@@ -18,6 +18,7 @@
    @PostMapping("/appointment/crm/app")
    Result crmApp(@RequestBody AppointmentCrmAddDto dto);


    /** 新增预约 */
    @PostMapping("/appointment/add")
    Result add(@RequestBody AppointmentV2Dto dto);

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

@@ -2,7 +2,6 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentAutoMateDto;
import com.hz.his.dto.appointment.AppointmentCrmAddDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

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

New file
@@ -0,0 +1,51 @@
package com.hz.his.feign.service.platform.appointment;

import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentAutoMateDto;
import com.hz.his.dto.appointment.AppointmentDto;
import com.hz.his.dto.appointment.AppointmentV2Dto;
import com.hz.his.dto.user.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 预约自动匹配service
 * @USER: fhx
 * @DATE: 2023/7/6
 **/
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-appointment-crm-self-v2")
public interface SPhipCrmSelfV2Service {

    /** 预约门店 */
    @PostMapping("/appointment/crm/self/v2/shop/list")
    Result shopList();

    /** 医生排班 */
    @PostMapping("/appointment/crm/self/v2/doctor/time/list")
    Result doctorTimeList(@RequestBody AppointmentAutoMateDto dto);

    /** 预约项目SPU */
    @PostMapping("/appointment/crm/self/v2/spu/list")
    Result spuList();

    /** 预约项目 */
    @PostMapping("/appointment/crm/self/v2/project/list")
    Result projectList(@RequestBody AppointmentDto dto);

    /** 用户预约列表 */
    @PostMapping("/appointment/crm/self/v2/list")
    Result list(@RequestBody UserDto dto);

    /** 自助预约匹配时间 */
    @PostMapping("/appointment/crm/self/v2/mate/time")
    Result mateTime(@RequestBody AppointmentAutoMateDto dto);

    /** 新增预约 */
    @PostMapping("/appointment/crm/self/v2/add")
    Result add(@RequestBody AppointmentV2Dto dto);

    /** 取消预约 */
    @PostMapping("/appointment/crm/self/v2/cancel")
    Result cancel(@RequestBody AppointmentV2Dto dto);
}