Merge branch 'dev' of liubing/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/UuidIdentityEntityWithOperatorAES.java

@@ -75,7 +75,7 @@ public abstract class UuidIdentityEntityWithOperatorAES extends UuidIdentityEnti
	}
	@Column(name = "create_user_name",updatable = false)
	@Convert(converter = StringFStringEncryptConverter.class)
//	@Convert(converter = StringFStringEncryptConverter.class)
	public String getCreateUserName() {
		return createUserName;
	}
@@ -104,7 +104,7 @@ public abstract class UuidIdentityEntityWithOperatorAES extends UuidIdentityEnti
	}
	@Column(name = "update_user_name")
	@Convert(converter = StringFStringEncryptConverter.class)
//	@Convert(converter = StringFStringEncryptConverter.class)
	public String getUpdateUserName() {
		return updateUserName;
	}

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientHospitalRecordDO.java

@@ -111,7 +111,7 @@ public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperator impl
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -218,7 +218,7 @@ public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperator impl
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistPatientRelationDO.java

@@ -59,14 +59,14 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
    private String signDoctor;//签约医生
    @Column(name = "sign_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    private String signDoctorName;//签约医生
    @Column(name = "health_doctor")
    private String healthDoctor;//健康管理师
    @Column(name = "health_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    private String healthDoctorName;//健康管理师姓名
    @Column(name = "sign_year")
@@ -126,7 +126,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.doctor = doctor;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -143,7 +143,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -176,7 +176,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.signDoctor = signDoctor;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getSignDoctorName() {
        return signDoctorName;
    }
@@ -193,7 +193,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.healthDoctor = healthDoctor;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getHealthDoctorName() {
        return healthDoctorName;
    }
@@ -234,7 +234,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.healthAssistant = healthAssistant;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getHealthAssistantName() {
        return healthAssistantName;
    }
@@ -332,7 +332,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -358,7 +358,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/GuidanceMessageLogDO.java

@@ -37,7 +37,7 @@ public class GuidanceMessageLogDO extends UuidIdentityEntityWithOperatorAES impl
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientDiagnosisInformationDO.java

@@ -77,7 +77,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -118,7 +118,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.attendingDoctorCode = attendingDoctorCode;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAttendingDoctorName() {
        return attendingDoctorName;
    }
@@ -175,7 +175,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

@@ -117,7 +117,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
    }
    @Column(name = "name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getName() {
        return name;
    }
@@ -241,7 +241,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -267,7 +267,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanLogDO.java

@@ -38,7 +38,7 @@ public class PatientRehabilitationPlanLogDO extends UuidIdentityEntity implement
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailAppointmentDO.java

@@ -38,7 +38,7 @@ public class RehabilitationDetailAppointmentDO extends UuidIdentityEntity implem
    }
    @Column(name = "appointment_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAppointmentDoctorName() {
        return appointmentDoctorName;
    }
@@ -84,7 +84,7 @@ public class RehabilitationDetailAppointmentDO extends UuidIdentityEntity implem
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailDO.java

@@ -154,7 +154,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -234,7 +234,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -260,7 +260,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationOperateRecordsDO.java

@@ -68,7 +68,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
    }
    @Column(name = "patient_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -87,7 +87,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -194,7 +194,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -220,7 +220,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }