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

fhx

2023-08-29 4829593daa194b175e9e914634d352c7c4f0ffc6

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

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

@@ -23,6 +23,8 @@
    private String labelInfoName;
    /**颜色*/
    private String color;
    /** 其他信息 */
    private AppearanceLabelInfoDto labelInfo;

    public AppearanceLabelDto() {
    }

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

New file
@@ -0,0 +1,26 @@
package com.hz.his.dto.appearance;

import lombok.Data;

/**
 * @USER: fhx
 * @DATE: 2023/8/29
 **/
@Data
public class AppearanceLabelInfoDto {

    /** 适应症程度 */
    private String indDegree;
    /** 剂量单位 */
    private String doseUnit;
    /** 建议治疗剂量 */
    private String treatDose;
    /** 项目诉求分类标识(AppealType) */
    private String appealTypeId;
    //格式：[{'appealTypeId':'123', 'name':'白', 'parentId':'123'},....]
    /** 项目诉求分类数组json */
    private String appealTypeJson;

    public AppearanceLabelInfoDto() {
    }
}

 phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java

@@ -27,7 +27,7 @@
    /** 证件编号 */
    private String certificateNo;
    /** 性别 */
    private Integer gender = SEX_WUMAN;
    private Integer gender;
    /** 主电话号码 */
    private String tel;
    /** 电话区码 */

 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java

@@ -74,7 +74,7 @@
    /** 语言类型名称 */
    private String languageTypeName;
    /** 用户年龄 */
    private Integer year = 0;
    private Integer year;

    /** 星座类型名称 */
    private String constellationTypeName;