Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-08-07 9fd5c6f5473e692b2f15d182d07bb5cf278f57a5

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java

@@ -35,6 +35,16 @@
    /** 到访订单id(门店助手使用统计使用) */
    private String visitOrderId;

    /**数据类型(AppearanceConstants)*/
    private Integer dataType;

    /** 短期规划 */
    private String shortPlan;
    /** 中期规划 */
    private String middlePlan;
    /** 长期规划 */
    private String longPlan;

    public AppearanceDto() {
    }


 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java

@@ -21,7 +21,7 @@
    private String hisId;
    /**商品phis类型*/
    private String hisType;
    /**商品所属phis分类标识集合*/
    /**商品所属phis分类标识集合-不用传*/
    private List<String> hisTypeIdList;
    /**单个商品金额*/
    private BigDecimal price;

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java

@@ -2,6 +2,7 @@

import com.hz.his.dto.PageDto;
import lombok.Data;
import org.dom4j.tree.BaseElement;

import java.math.BigDecimal;
import java.util.List;
@@ -47,4 +48,7 @@
    private String couponGoodsArr;
    /** 订单应付金额 */
    private BigDecimal shouldTotal;

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;
}

 phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java

@@ -23,4 +23,10 @@
    Date endTime;
    Integer intervalTime;

    private String remark;
    private Integer timeType;
    private Integer isSpec;
    private String opEmpName;
    private String opEmpId;

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.doctorTime.DoctorTimeDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

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

    /**
     * 医生排班新增
     * */
    @PostMapping(value = "/doctor/time/add")
    Result addDoctorTime(@RequestBody DoctorTimeDto doctorTimeDto);
}

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

@@ -21,6 +21,14 @@
    Result list(@RequestBody RevenueQuery revenueQuery);

    /**
     * 获取上海卫监费用列表
     * @param revenueQuery
     * @return
     */
    @PostMapping("/revenue/recogntion/shanghai/hs/fee/list")
    Result shanghaiHsFeeList(@RequestBody RevenueQuery revenueQuery);

    /**
     * 导出excel
     */
    @PostMapping("/revenue/recogntion/export/excel")