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

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

@@ -1,18 +1,22 @@
package com.yihu.jw.entity.specialist.rehabilitation;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by humingfen on 2019/2/11.
 */
@Entity
@Table(name = "wlyy_patient_diagnosis_information")
public class PatientDiagnosisInformationDO extends UuidIdentityEntityWithOperator implements Serializable {
public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
@@ -38,6 +42,14 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntityWithOperato
    private String dischargeDiagnosis;//出院诊断
    @Column(name = "advice")
    private String advice;//医嘱小结
    @Column(name = "discharge_time")
    private Date dischargerTime;
    @Column(name = "create_time")
    protected Date createTime;//创建时间
    @Column(name = "create_user")
    protected String createUser;//创建者
    @Column(name = "create_user_name")
    protected String createUserName;//创建者
    public String getSaasId() {
        return saasId;
@@ -134,4 +146,36 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntityWithOperato
    public void setAdvice(String advice) {
        this.advice = advice;
    }
    public Date getDischargerTime() {
        return dischargerTime;
    }
    public void setDischargerTime(Date dischargerTime) {
        this.dischargerTime = dischargerTime;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
}

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")
    @Query("select d from PatientDiagnosisInformationDO d where d.patient = ?1 order by d.dischargerTime desc")
    Page<PatientDiagnosisInformationDO> findByPatient(String patient, Pageable pageRequest);
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/DiagnosisInformationService.java

@@ -34,7 +34,6 @@ public class DiagnosisInformationService extends BaseJpaService<PatientDiagnosis
    public Envelop createDiagnosisInformation(PatientDiagnosisInformationDO diagnosisInformationDO) {
        Date date = new Date();
        diagnosisInformationDO.setCreateTime(date);
        diagnosisInformationDO.setUpdateTime(date);
        diagnosisInformationDao.save(diagnosisInformationDO);
        return Envelop.getSuccess(SpecialistMapping.api_success);
    }