Merge branch 'rx-初诊卡标签' into master-prod-new

rx

2024-05-16 0fb0c33513c2b83ac3c6523c48b6a6ab5d8c71bc

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

@@ -166,8 +166,10 @@
    private String mainAppeal;
    private String minorAppeal;

    /**是否处理可是*/
    /**是否处理科室*/
    private Integer isEditFamiliesRoom = 0;
    /**是否发送修改科室通知*/
    private Integer isEditFRSentNotice = 0;

    public UserParamDto() {
    }
@@ -187,9 +189,4 @@
    public static final String CATEGORY_EMPLOYEE = "employee";
    /**渠道类别-自己来*/
    public static final String CATEGORY_ONESELF = "oneself";





}