Merge branch 'fhx-prod-CRM预约' into master-test

fhx

2024-04-02 de54c5916e2540eb7d8ab9c439378afa17072d87

Merge branch 'fhx-prod-CRM预约' into master-test

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

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

import lombok.Data;

import java.util.Date;

/**
 * 预约V2版dto
 * @USER: fhx
@@ -26,6 +28,8 @@
    private String shopId;
    /** 医生id */
    private String doctorId;
    /** 护士id */
    private String nurseId;
    /** 预约顾问id */
    private String corpUserId;
    /** 活动日期id */
@@ -74,6 +78,8 @@
    private String zlTimeJson;
    /** 设备时间json字符串 */
    private String deviceTimeJson;
    /** 生日日期(yyyy-MM-dd) */
    private String birthday;

    /** 开始日期(yyyy-MM-dd) */
    private String arriveDate;
@@ -122,6 +128,15 @@
    /** 真实麻敷时长 */
    private Integer realPalsyDuration;

    /** 取消预约凭证文件路径 */
    private String annexUrl;


//    /** 编辑预约 - 是否日期有变化(0否1是) */
//    private Integer isDayChange;
//    /** 编辑预约 - 是否项目有变化(0否1是) */
//    private Integer isProjectChange;
//    /** 编辑预约 - 是否医生有变化(0否1是) */
//    private Integer isChangeDoctor;
//    /** 编辑预约 - 是否时间有变化(0否1是) */
//    private Integer isChangeTime;
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentCrmAddDto;
import com.hz.his.dto.appointment.AppointmentV2Dto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,4 +17,16 @@
    /** CRM预约 */
    @PostMapping("/appointment/crm/app")
    Result crmApp(@RequestBody AppointmentCrmAddDto dto);

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

    /** 编辑预约 */
    @PostMapping("/appointment/edit")
    Result edit(@RequestBody AppointmentV2Dto dto);

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