Merge branch 'rx-0822-咨询记录' into master-test

rx

2023-09-12 ec34a6698205107f7583f8b136e4cd26fb32f68b

 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;
@@ -311,6 +313,14 @@
        this.satisfie = satisfie;
    }

    public String getFaceDoctorName() {
        return faceDoctorName;
    }

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

    public String getTreatDoctorName() {
        return treatDoctorName;
    }
@@ -384,6 +394,22 @@
        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() {
        return internetCorpUserId;
    }