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

fwq

2024-04-11 dff9cfc66cdcb547578d99af6f5080dbdf902183

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

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

@@ -13,7 +13,15 @@
    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 登录操作人角色id */
    private String loginRoleId;
    private String opRoleId;


    /** 预约id */
    private String appointmentId;
    /** 用户id */
    private String userId;
    /** 门店id */
    private String shopId;

    /** 到访订单id */
    private String id;
@@ -24,8 +32,10 @@
    private String doctorId;
    /** 分诊护士id */
    private String nurseId;
    /**  */
    private Integer type;
    /** 到访类型(VisitRecord) */
    private Integer arrivalType;
//    /**  */
//    private Integer type;
    /** 状态 */
    private Integer status;
    /** 等待时间 */
@@ -43,4 +53,5 @@
    /** 项目json字符 */
    private String projectJson;


}

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

File was deleted

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

New file
@@ -0,0 +1,20 @@
//package com.hz.his.feign.service.platform.visit;
//
//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="phi-platform-service",path = "/phip",contextId = "phis-mot-visit")
//public interface SPhisMotVisitService {
//    /**
//     * mot扫码到访
//     */
//    @RequestMapping("/mot/visit/scan/code/arrival")
//    Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto);
//}

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

File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java
@@ -1,7 +1,6 @@
package com.hz.his.feign.service.platform;
package com.hz.his.feign.service.platform.visit;

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;
@@ -13,6 +12,11 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SPhisVisitOrderService {

    @RequestMapping("/visit/order/user/self/visit")
    Result userSelfVisit(@RequestBody VisitOrderDto dto);

    ///////////////////////////////////////////////////////////////////////

    /** 到店 */
    @RequestMapping("/visit/order/arrival")
    Result arrival(@RequestBody VisitOrderDto dto);