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

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

@@ -43,7 +43,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
    @Column(name = "advice")
    private String advice;//医嘱小结
    @Column(name = "discharge_time")
    private Date dischargerTime;
    private Date dischargeTime;
    @Column(name = "create_time")
    protected Date createTime;//创建时间
    @Column(name = "create_user")
@@ -147,12 +147,12 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.advice = advice;
    }
    public Date getDischargerTime() {
        return dischargerTime;
    public Date getDischargeTime() {
        return dischargeTime;
    }
    public void setDischargerTime(Date dischargerTime) {
        this.dischargerTime = dischargerTime;
    public void setDischargeTime(Date dischargeTime) {
        this.dischargeTime = dischargeTime;
    }
    public Date getCreateTime() {

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/PatientDiagnosisInformationDao.java

@@ -15,6 +15,6 @@ public interface PatientDiagnosisInformationDao extends PagingAndSortingReposito
    PatientDiagnosisInformationDO findByPlanId(String planId);
    @Query("select d from PatientDiagnosisInformationDO d where d.patient = ?1 order by d.dischargerTime desc")
    @Query("select d from PatientDiagnosisInformationDO d where d.patient = ?1 order by d.dischargeTime desc")
    Page<PatientDiagnosisInformationDO> findByPatient(String patient, Pageable pageRequest);
}