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

Andru

2023-10-27 599cb3a300878dc8b3a579f967fbad4a7eb536e7

 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java

@@ -54,10 +54,8 @@
    //推荐项目 多个逗号分割
    private String recommendProjectIds;
    //上次治疗医生ID
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String lastTreatDoctorId;
    //上次治疗项目json字符串 ["项目ID","项目ID"]
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String lastTreatProjects;
    //咨询方式代码
    private String methodCode;
@@ -68,12 +66,12 @@
    private String id;


    //------------- 非初诊 复诊 详情返回
    //------------- 详情返回
    //治疗医生名称
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String faceDoctorName;
    //治疗医生名称
    private String treatDoctorName;
    //上次治疗医生名称
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String lastTreatDoctorName;

    //------------ 详情返回值补充
@@ -108,6 +106,10 @@
    //咨询师
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String hisCorpUserId;
    //用户顾问名称
    private String hisCorpUserName;
    //手机号
    private String tel;
    //电网咨询师
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String internetCorpUserId;
@@ -133,13 +135,17 @@
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private Integer isMakeADeal;

    //列表接口 小程序也使用 区分是否是从用户详情进去的
    private Integer isDetail;

    /**当前页数*/
    private Integer pageNum = 1;
    /**当前页显示条数*/
    private Integer pageSize = 20;
    /**关键字*/
    private String keyWord;

    /**查询方式*/
    private String useType;
    public ConsultRecordDto() {
    }

@@ -311,6 +317,14 @@
        this.satisfie = satisfie;
    }

    public String getFaceDoctorName() {
        return faceDoctorName;
    }

    public void setFaceDoctorName(String faceDoctorName) {
        this.faceDoctorName = faceDoctorName;
    }

    public String getTreatDoctorName() {
        return treatDoctorName;
    }
@@ -382,6 +396,22 @@

    public void setHisCorpUserId(String hisCorpUserId) {
        this.hisCorpUserId = hisCorpUserId;
    }

    public String getHisCorpUserName() {
        return hisCorpUserName;
    }

    public void setHisCorpUserName(String hisCorpUserName) {
        this.hisCorpUserName = hisCorpUserName;
    }

    public String getTel() {
        return tel;
    }

    public void setTel(String tel) {
        this.tel = tel;
    }

    public String getInternetCorpUserId() {
@@ -527,4 +557,20 @@
    public void setMethodCodeName(String methodCodeName) {
        this.methodCodeName = methodCodeName;
    }

    public String getUseType() {
        return useType;
    }

    public void setUseType(String useType) {
        this.useType = useType;
    }

    public Integer getIsDetail() {
        return isDetail;
    }

    public void setIsDetail(Integer isDetail) {
        this.isDetail = isDetail;
    }
}