Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorDao.java

@@ -38,7 +38,7 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    Iterable<Doctor> findHospitalDoctors(String hospital);
    // 手机号查询医生信息
    @Query("select p from Doctor p where p.mobile = ?1")
    @Query("select p from Doctor p where p.mobile = ?1 and p.status = 1")
    Doctor findByMobile(String mobile);
    // 根据医生分组查询患者信息

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -1132,7 +1132,8 @@ public class SignPatientLabelInfoService extends BaseService {
        page = page * pagesize;
        Object[] args = null;
        String sql = "";
        String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        //String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        String reg = "^(\\d+)([0-9]|X|x)$";
        Pattern pattern = Pattern.compile(reg);
        Matcher matcher = pattern.matcher(filter);
@@ -1147,11 +1148,11 @@ public class SignPatientLabelInfoService extends BaseService {
                    "    (t.doctor = ? or t.doctor_health = ?) " +
                    (teamCode > 0 ? ("    and t.admin_team_code = " + teamCode) : "") +
                    (StringUtils.isNotEmpty(labelCode) ? " and l.label = ? and l.label_type = ? " : "") +
                    "     and p.idcard = ? ";
                    "     and p.idcard like ? ";
            if (StringUtils.isNotEmpty(labelCode)) {
                args = new Object[]{doctor, doctor, labelCode, labelType, filter};
                args = new Object[]{doctor, doctor, labelCode, labelType, "%" + filter + "%"};
            } else {
                args = new Object[]{doctor, doctor, filter};
                args = new Object[]{doctor, doctor, "%" + filter  + "%"};
            }
        } else {
            sql = "select " +
@@ -1337,7 +1338,7 @@ public class SignPatientLabelInfoService extends BaseService {
            teams = adminTeamService.getDoctorTeams(doctor);
        }
        String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        String reg = "^(\\d+)([0-9]|X|x)$"; //"(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        Pattern pattern = Pattern.compile(reg);
        Matcher matcher = pattern.matcher(filter);
        boolean isIdcard = matcher.find();
@@ -1355,7 +1356,7 @@ public class SignPatientLabelInfoService extends BaseService {
                "     wlyy_sign_family f,wlyy_patient p " +
                " where " +
                "      f.patient = p.code and (f.doctor = ? or f.doctor_health = ?) and f.admin_team_code = ? and f.status > 0 and " +
                (isIdcard ? " p.idcard = ? " : " f.name like ?") +
                (isIdcard ? " p.idcard like ? " : " f.name like ?") +
                ") " +
                (page < 0 ? "" : "limit " + start + "," + size);
@@ -1363,7 +1364,7 @@ public class SignPatientLabelInfoService extends BaseService {
            for (AdminTeam team : teams) {
                teamMap.put(team.getId(), team);
                List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, new Object[]{doctor, doctor, team.getId(),
                        isIdcard ? filter : "%" + filter + "%"});
                        "%" + filter + "%"});
                if (result != null && result.size() > 0) {
                    for (Map<String, Object> p : result) {
@@ -1574,7 +1575,8 @@ public class SignPatientLabelInfoService extends BaseService {
        page = page * pagesize;
        Object[] args = null;
        String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        //String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        String reg = "^(\\d+)([0-9]|X|x)$";
        Pattern pattern = Pattern.compile(reg);
        Matcher matcher = pattern.matcher(filter);
        String sqlTemp = "";
@@ -1589,11 +1591,11 @@ public class SignPatientLabelInfoService extends BaseService {
                    " where " +
                    "     t.admin_team_code = ? " +
                    (StringUtils.isNotEmpty(labelCode) ? " and l.label = ? and l.label_type = ? " : "") +
                    "     and p.idcard = ? ";
                    "     and p.idcard like ? ";
            if (StringUtils.isNotEmpty(labelCode)) {
                args = new Object[]{teamCode, labelCode, labelType, filter};
                args = new Object[]{teamCode, labelCode, labelType, "%" + filter + "%"};
            } else {
                args = new Object[]{teamCode, filter};
                args = new Object[]{teamCode, "%" + filter + "%"};
            }
        } else {
            sqlTemp = "select " +
@@ -1759,11 +1761,12 @@ public class SignPatientLabelInfoService extends BaseService {
        Map<String, JSONObject> result = new HashMap<>();
        List<Map<String, Object>> signList = new ArrayList<>();
        page = page * pagesize;
        String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        //String reg = "(^\\d{15}$)|(^\\d{17}([0-9]|X)$)";
        String reg = "^(\\d+)([0-9]|X|x)$";
        Pattern pattern = Pattern.compile(reg);
        Matcher matcher = pattern.matcher(filter);
        boolean isIdcard = matcher.find();
        Object[] args = new Object[]{teamCode, isIdcard ? filter : "%" + filter + "%"};
        Object[] args = new Object[]{teamCode, "%" + filter + "%"};
        String sqlTemp = "select " +
                "    DISTINCT t1.* " +
@@ -1775,7 +1778,7 @@ public class SignPatientLabelInfoService extends BaseService {
                "    t1.status > 0 " +
                " AND t1.admin_team_code = ? " +
                "  AND" +
                (isIdcard ? " p.idcard = ? " : " t1.name like ? ");
                (isIdcard ? " p.idcard like ? " : " t1.name like ? ");
        String sql = sqlTemp + " limit " + page + "," + pagesize;
        signList = jdbcTemplate.queryForList(sql, args);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -106,6 +106,7 @@ public class PatientService extends TokenService {
                patientDao.save(p);
            }
        }
        patient.setOpenid(openid);
        patientDao.save(patient);
        if (StringUtils.isNotEmpty(patient.getOpenid())) {
            signFamilyDao.updateOpenidByPatient(patient.getOpenid(), patient.getCode());