Merge branch 'master-prod-new' into master-test

fwq

2023-07-12 f19ddcd887b1e4c8054a0da978d115cf307affcc

Merge branch 'master-prod-new' into master-test

 phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.dto.channel;

import lombok.Data;

import java.util.List;

/**
 * @author fwq
 * 渠道扩展
 * */
@Data
public class ChannelGeneralDto {

    /**主渠道一级标识*/
    private String channelId;
    /**主渠道二级标识*/
    private String channel2Id;

    /**次渠道一级标识*/
    private String channelAssId;
    /**次渠道二级标识*/
    private String channelAss2Id;

    /**渠道大类标识*/
    private List<String> typeIdList;

    /**判断哪些:0主渠道1次渠道*/
    private Integer checkType;

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.channel.ChannelDto;
import com.hz.his.dto.channel.ChannelGeneralDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +36,11 @@
     */
    @PostMapping(value = "/channels/type/list")
    Result getChannelsListByType(@RequestBody PageDto pageDto);

    /**
     * 获取渠道列表-判断是否归属
     * @return Result
     */
    @PostMapping(value = "/channels/type/check")
    Result checkInChannel(@RequestBody ChannelGeneralDto channelGeneralDto);
}