Merge branch 'master' into master-test

wangrenhuang

2023-11-13 499737916d0cb59092c04d6523d4607ff0a5556a

Merge branch 'master' into master-test

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

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

import lombok.Data;

/**
 * 用户科室关系转换使用
 * code_no_data
 * */
@Data
public class UserDoctorRoomListDto {
    /**用户标识*/
    private String userId;
    /**操作人标识*/
    private String opEmpId;
    /**科室关系Json*/
    private String roomJson;
}

 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);
}