Merge remote-tracking branch 'origin/master-stander' into master-jiayan

fhx

2024-07-09 88b7bbeb15ed4be555d41e98cbd0b8d2868609de

Merge remote-tracking branch 'origin/master-stander' into master-jiayan

 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java

@@ -148,6 +148,9 @@
    //作废划扣原因
    private String invalidReason;

    //适应症
    private List<DeductionIndicationDto> indicationList;

    public DeductionDto() {

    }

 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionIndicationDto.java

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

import lombok.Data;

/**
 *  划扣项目适应症
 */
@Data
public class DeductionIndicationDto {
    /**划扣项目清单标识*/
    private String deductionSingleId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**适应症标识*/
    private String indicationId;
    /**适应症名称*/
    private String indication;
    /**适应症关联分类JSON字符*/
    private String typeJson;
}

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

@@ -9,7 +9,7 @@
/**
 * @author CJH
 **/
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "read-appointment")
@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "read-appointment")
public interface SAppointmentService {

    /** 获取用户时间内预约的项目 */

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

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

import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "systemParameter")
public interface SSystemParameterService {

    /**
     * 获取配置
     * @param paramName 配置名称
     * @return
     */
    @PostMapping(value = "/system/parameter/get")
    Result getSystemParameterByNAME(@RequestParam("paramName") String paramName);
}