Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-04-11 f31ae0176ba124a2a39121584f5c39c3de932157

Merge remote-tracking branch 'origin/master-test' into master-test

 phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java

New file
@@ -0,0 +1,46 @@
package com.hz.his.dto.visitOrder;

import lombok.Data;

/**
 * 到访操作dto
 * @USER: fhx
 * @DATE: 2024/4/11
 **/
@Data
public class VisitOrderDto {

    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 登录操作人角色id */
    private String loginRoleId;

    /** 到访订单id */
    private String id;
    private String orderId;
    /** 分诊顾问id */
    private String adviserId;
    /** 分诊医生id */
    private String doctorId;
    /** 分诊护士id */
    private String nurseId;
    /**  */
    private Integer type;
    /** 状态 */
    private Integer status;
    /** 等待时间 */
    private String waitingTime;
    /** 开始时间 */
    private String startTime;
    /** 结束时间 */
    private String endTime;
    /** 备注 */
    private String remarks;
    /** 取消凭证文件路径 */
    private String annexUrl;
    /** 是否记录删除 */
    private Integer isMarkDel;
    /** 项目json字符 */
    private String projectJson;

}

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

File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
@@ -10,11 +10,11 @@
/**
 * mot扫码到访
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SVisitOrderService {
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-mot-visit")
public interface SPhisMotVisitService {
    /**
     * mot扫码到访
     */
    @RequestMapping("/visit/order/mot/scanCode")
    @RequestMapping("/mot/visit/scan/code/arrival")
    Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto);
}

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

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

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

/**
 * mot扫码到访
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SPhisVisitOrderService {

    /** 到店 */
    @RequestMapping("/visit/order/arrival")
    Result arrival(@RequestBody VisitOrderDto dto);
    /** 分诊 */
    @RequestMapping("/visit/order/triage")
    Result triage(@RequestBody VisitOrderDto dto);
    /** 客户离开 */
    @RequestMapping("/visit/order/leave")
    Result leave(@RequestBody VisitOrderDto dto);
    /** 开始接待 */
    @RequestMapping("/visit/order/reception")
    Result reception(@RequestBody VisitOrderDto dto);
    /** 接待结束 */
    @RequestMapping("/visit/order/reception/end")
    Result receptionEnd(@RequestBody VisitOrderDto dto);
    /** 开始面诊 */
    @RequestMapping("/visit/order/examine")
    Result examine(@RequestBody VisitOrderDto dto);
    /** 结束面诊 */
    @RequestMapping("/visit/order/examine/end")
    Result examineEnd(@RequestBody VisitOrderDto dto);
    /** 开始术前准备 */
    @RequestMapping("/visit/order/preoperative")
    Result preoperative(@RequestBody VisitOrderDto dto);
    /** 是否卸麻（护士发送） */
    @RequestMapping("/visit/order/discharge/noti")
    Result dischargeNotify(@RequestBody VisitOrderDto dto);
    /** 是否卸麻（MIC发送） */
    @RequestMapping("/visit/order/mic/discharge/noti")
    Result dischargeMicNotify(@RequestBody VisitOrderDto dto);
    /** 结束术前准备 */
    @RequestMapping("/visit/order/preoperative/end")
    Result preoperativeEnd(@RequestBody VisitOrderDto dto);
    /** 结束术前并开始治疗 */
    @RequestMapping("/visit/order/endPreAndStartTreat")
    Result endPreAndStartTreat(@RequestBody VisitOrderDto dto);
    /** 开始治疗 */
    @RequestMapping("/visit/order/treat")
    Result treat(@RequestBody VisitOrderDto dto);
    /** 结束治疗 */
    @RequestMapping("/visit/order/treat/end")
    Result treatEnd(@RequestBody VisitOrderDto dto);
    /** 结束治疗并开始术后 */
    @RequestMapping("/visit/order/endTreatAndStartPost")
    Result endTreatAndStartPost(@RequestBody VisitOrderDto dto);
    /** 开始术后 */
    @RequestMapping("/visit/order/after_operation")
    Result afterOperation(@RequestBody VisitOrderDto dto);
    /** 开始术后 */
    @RequestMapping("/visit/order/after_operation/end")
    Result afterOperationEnd(@RequestBody VisitOrderDto dto);
    /** 撤回上级状态 */
    @RequestMapping("/visit/order/to_withdraw/status")
    Result withdraw(@RequestBody VisitOrderDto dto);
    /** 通知MIC分配面诊 */
    @RequestMapping("/visit/order/mic/notice")
    Result noticeMIC(@RequestBody VisitOrderDto dto);
    /** 稍后几分钟卸麻 */
    @RequestMapping("/visit/order/waiting/hemp")
    Result waitingHemp(@RequestBody VisitOrderDto dto);
    /** MIC直接修改预约时间或者取消订单 */
    @RequestMapping("/visit/order/mic/preStartTime/edit")
    Result micPreStartTimeEdit(@RequestBody VisitOrderDto dto);
    /** 修改订单 */
    @RequestMapping("/visit/order/orderProject/edit")
    Result orderProjectEdit(@RequestBody VisitOrderDto dto);
    /** 根据预约id获取预约订单 */
    @RequestMapping("/visit/order/get/appointment")
    Result getAppointment(@RequestBody VisitOrderDto dto);
    /** 是否敷麻（MIC发送） */
    @RequestMapping("/visit/order/mic/shima/noti")
    Result Shimatify(@RequestBody VisitOrderDto dto);
    /** 是否敷麻（护士发送） */
    @RequestMapping("/visit/order/shima/noti")
    Result shimaNotify(@RequestBody VisitOrderDto dto);
    /** 稍后几分钟敷麻 */
    @RequestMapping("/visit/order/waiting/shima")
    Result waitingShima(@RequestBody VisitOrderDto dto);


}