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

wangrenhuang

2022-11-21 d9ec5419cb3c8dacd50111498d34c138858a08e7

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

 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java

New file
@@ -0,0 +1,20 @@
package com.hz.his.dto.treat;

import lombok.Data;

/**
 * @author fwq
 * 术后视频关联员工
 * */
@Data
public class TreatAfterEmployeeDto {
    /**人员类型,不传默认医生类型*/
    private Integer type;
    /**人员标识(员工标识)*/
    private String commonId;

    /**人员类型-医生*/
    public static final Integer TYPE_DOCTOR = 0;
    /**人员类型-护士*/
    public static final Integer TYPE_NURSE = 1;
}

 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.dto.treat;

import lombok.Data;

/**
 * @author fwq
 * 术后视频关联项目
 * */
@Data
public class TreatAfterProjectDto {
    /**项目关联类型,不传默认项目sku*/
    private Integer type;
    /**公共标识*/
    private String commonId;

    /**类型-项目SKU*/
    public static final Integer TYPE_SKU = 0;
    /**类型-项目SPU*/
    public static final Integer TYPE_SPU = 1;
    /**类型-项目所属末级分类*/
    public static final Integer TYPE_TYPE = 2;
}

 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java

New file
@@ -0,0 +1,19 @@
package com.hz.his.dto.treat;

import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;

/**
 * @author fwq
 * 术后视频
 * */
@Data
public class TreatAfterVideoDto extends PageDto {
    /*******************2022-11-17:条件暂时是并且的关系***************************/
    /**人员条件集合*/
    private List<TreatAfterEmployeeDto> employeeDtoList;
    /**项目条件集合*/
    private List<TreatAfterProjectDto> projectDtoList;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java

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

import com.hx.resultTool.Result;
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;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 术后视频
 */
@FeignClient(name="phis-service",contextId = "phis-treat-after-video")
public interface STreatService {
    /**
     * 术后视频查询接口
     */
    @RequestMapping("/foreign/treat/after/video/list")
    Result treatAfterVideoList(@RequestBody TreatAfterVideoDto treatAfterVideoDto);
}