Merge remote-tracking branch 'origin/rx-治疗屏用户资料卡' into master-test

rx

2024-04-11 023a48ec1e02c80859d56782eb0f2323f8decae3

Merge remote-tracking branch 'origin/rx-治疗屏用户资料卡' into master-test

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

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

@@ -159,6 +159,10 @@
    //客人后续是否有安排事情和工作
    private String followUpWorks;


    /***导医用户治疗屏操作时 查询咨询记录需要输入校验密码 用户ciq后四位**/
    private String checkPassword;

    public ConsultRecordDto() {
    }

@@ -626,4 +630,12 @@
    public void setFollowUpWorks(String followUpWorks) {
        this.followUpWorks = followUpWorks;
    }

    public String getCheckPassword() {
        return checkPassword;
    }

    public void setCheckPassword(String checkPassword) {
        this.checkPassword = checkPassword;
    }
}