我的家人模块代码提交

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientMedicardCardService.java

@@ -73,9 +73,6 @@ public class BasePatientMedicardCardService<T, R extends CrudRepository> extends
    public PatientMedicareCardDO findByTypeAndPatientCodeAndDel(String Type,String patientCode,String del)throws Exception{
        PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(Type,patientCode,del);
        if(patientMedicareCardDO==null){
            throw new Exception("no PatientMedicareCard entity");
        }
        return patientMedicareCardDO;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -2,14 +2,10 @@ package com.yihu.jw.entity.base.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.Range;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.Date;
@@ -229,17 +225,17 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    /**
     * 账号是否被锁定
     */
    private int locked;
    private Integer locked;
    /**
     * 是否可以登录
     */
    private int enabled;
    private Integer enabled;
    /**
     * 登录失败次数
     */
    private int loginFailureCount;
    private Integer loginFailureCount;
    /**
     * 锁定日期
@@ -568,27 +564,27 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveStreetName = liveStreetName;
    }
    public int getLocked() {
    public Integer getLocked() {
        return locked;
    }
    public void setLocked(int locked) {
    public void setLocked(Integer locked) {
        this.locked = locked;
    }
    public int getEnabled() {
    public Integer getEnabled() {
        return enabled;
    }
    public void setEnabled(int enabled) {
    public void setEnabled(Integer enabled) {
        this.enabled = enabled;
    }
    public int getLoginFailureCount() {
    public Integer getLoginFailureCount() {
        return loginFailureCount;
    }
    public void setLoginFailureCount(int loginFailureCount) {
    public void setLoginFailureCount(Integer loginFailureCount) {
        this.loginFailureCount = loginFailureCount;
    }

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/PatientApplyLogService.java

@@ -48,13 +48,13 @@ public class PatientApplyLogService extends BaseJpaService<PatientApplyLog, Pati
    //valid 有效
    public List<Map<String, Object>> findValidByPatient(String patient){
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and l.status in (1,2) and l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"+"'");
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and l.status in (1,2) and l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss")+"'";
        return jdbcTemplate.queryForList(sql);
    }
    //invalid 无效
    public List<Map<String, Object>> findInvalidByPatient(String patient){
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and (l.status in (4,5) or (l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss")+"' and l.status in (1,2))) limit0,10";
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and (l.status in (4,5) or (l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss")+"' and l.status in (1,2))) limit 0,10";
        return jdbcTemplate.queryForList(sql);
    }