Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -126,7 +126,7 @@ public class PatientInfoService extends BaseService {
     */
    public int isMobileRegister(String mobile) {
        List<Patient> p = patientDao.findByMobile(mobile);
        if (p != null&& p.size()>0) {
        if (p != null && p.size() > 0) {
            return 1;
        } else {
            return 0;
@@ -150,7 +150,7 @@ public class PatientInfoService extends BaseService {
            return result;
        }
        if(!patient.equals(family)) {
        if (!patient.equals(family)) {
            PatientFamilyMember member = familyMemberService.getPatientFamilyMember(patient, family);
            // 家庭成员中不存在该人
            if (member == null) {
@@ -227,7 +227,9 @@ public class PatientInfoService extends BaseService {
    public Patient updatePatient(Patient patient) {
        if (StringUtils.isNotEmpty(patient.getStreet())) {
            Street street = streetDao.findByCode(patient.getStreet());
            patient.setStreetName(street.getName());
            if (street != null) {
                patient.setStreetName(street.getName());
            }
        } else {
            patient.setStreetName("");
        }
@@ -285,7 +287,7 @@ public class PatientInfoService extends BaseService {
    public void checkMobile(String mobile) throws Exception {
        List<Patient> p = patientDao.findByMobile(mobile);
        if (p != null&&p.size()>0) {
        if (p != null && p.size() > 0) {
            throw new Exception("手机号已经被注册");
        }
    }

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -46,11 +46,12 @@ spring:
  redis:
    database: 0 # Database index used by the connection factory.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
      #sentinel:
      #  master: # Name of Redis server.
      #  nodes: # Comma-separated list of host:port pairs.
    timeout: 120000 # 连接超时时间（毫秒） 60秒
    pool:
      max-active: 20 # 连接池最大连接数（使用负值表示没有限制）
      max-wait: -1  # 连接池最大阻塞等待时间（使用负值表示没有限制）
      max-idle: 20  # 连接池中的最大空闲连接
      min-idle: 5  # 连接池中的最小空闲连接
logging:
  level: