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

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

@@ -81,6 +81,8 @@ public class SignPatientLabelInfoService extends BaseService {
        json.put("name", p.getName());
        // 设置患者手机号
        json.put("mobile", p.getMobile());
        // 设置患者微信openid
        json.put("openid", StringUtils.isNotEmpty(p.getOpenid()) ? p.getOpenid() : "");
        // 设置患者联系电话
        json.put("phone", p.getPhone());
        // 设置患者头像
@@ -204,7 +206,7 @@ public class SignPatientLabelInfoService extends BaseService {
                throw new Exception("label is not exist");
            }
            args = new Object[]{doctor, teamCode,doctor, teamCode};
            args = new Object[]{doctor, teamCode, doctor, teamCode};
        } else {
            if (labelCode.equals("0")) {
                sql = "SELECT " +
@@ -222,7 +224,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.status > 0 " +
                        "    AND t1.admin_team_code = ? ";
                args = new Object[]{labelType, doctor, teamCode,labelType, doctor, teamCode};
                args = new Object[]{labelType, doctor, teamCode, labelType, doctor, teamCode};
            } else {
                sql = "SELECT " +
                        "    t1.* " +
@@ -239,12 +241,12 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.status > 0 " +
                        "    AND t1.admin_team_code = ? ";
                args = new Object[]{labelCode, labelType, doctor, teamCode,labelCode, labelType, doctor, teamCode};
                args = new Object[]{labelCode, labelType, doctor, teamCode, labelCode, labelType, doctor, teamCode};
            }
        }
        String sqlDoc = sql.replaceAll("repdoctor","doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor","doctor_health").replaceAll("t1","t3").replace("t2","t4");
        String sqlDoc = sql.replaceAll("repdoctor", "doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor", "doctor_health").replaceAll("t1", "t3").replace("t2", "t4");
        sql = "select t.* from (" + sqlDoc + " union all " + sqlDocHealth + ") t limit " + start + "," + pagesize;
@@ -295,6 +297,8 @@ public class SignPatientLabelInfoService extends BaseService {
                json.put("name", p.getName());
                // 设置患者手机号
                json.put("mobile", p.getMobile());
                // 设置患者微信openid
                json.put("openid", StringUtils.isNotEmpty(p.getOpenid()) ? p.getOpenid() : "");
                // 设置患者联系电话
                json.put("phone", p.getPhone());
                // 设置患者紧急联系人
@@ -373,10 +377,10 @@ public class SignPatientLabelInfoService extends BaseService {
        sql = " select * from wlyy_sign_family where " +
                " repdoctor = ? and status > 0 and admin_team_code = ? ";
        String sqlDoc = sql.replaceAll("repdoctor","doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor","doctor_health");
        String sqlDoc = sql.replaceAll("repdoctor", "doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor", "doctor_health");
        args = new Object[]{doctor, teamCode,doctor, teamCode};
        args = new Object[]{doctor, teamCode, doctor, teamCode};
        sql = "select t.* from (" + sqlDoc + " union all " + sqlDocHealth + ") t limit " + start + "," + pagesize;
        signList = jdbcTemplate.queryForList(sql, args);
@@ -438,6 +442,8 @@ public class SignPatientLabelInfoService extends BaseService {
                json.put("name", p.getName());
                // 设置患者手机号
                json.put("mobile", p.getMobile());
                // 设置患者微信openid
                json.put("openid", StringUtils.isNotEmpty(p.getOpenid()) ? p.getOpenid() : "");
                // 设置患者联系电话
                json.put("phone", p.getPhone());
                // 设置患者紧急联系人
@@ -561,9 +567,9 @@ public class SignPatientLabelInfoService extends BaseService {
                        throw new Exception("label is not exist");
                    }
                    if (teamCode > 0) {
                        args = new Object[]{doctor, teamCode,doctor, teamCode};
                        args = new Object[]{doctor, teamCode, doctor, teamCode};
                    } else {
                        args = new Object[]{doctor,doctor};
                        args = new Object[]{doctor, doctor};
                    }
                } else {
                    if (label.getLabelCode().equals("0")) {
@@ -583,9 +589,9 @@ public class SignPatientLabelInfoService extends BaseService {
                                (teamCode > 0 ? "    AND t1.admin_team_code = ? " : "");
                        if (teamCode > 0) {
                            args = new Object[]{labelType, doctor, teamCode,labelType, doctor, teamCode};
                            args = new Object[]{labelType, doctor, teamCode, labelType, doctor, teamCode};
                        } else {
                            args = new Object[]{labelType, doctor,labelType, doctor};
                            args = new Object[]{labelType, doctor, labelType, doctor};
                        }
                    } else {
                        sql = " SELECT " +
@@ -604,15 +610,15 @@ public class SignPatientLabelInfoService extends BaseService {
                                (teamCode > 0 ? "    AND t1.admin_team_code = ? " : "");
                        if (teamCode > 0) {
                            args = new Object[]{label.getLabelCode(), labelType, doctor, teamCode,label.getLabelCode(), labelType, doctor, teamCode};
                            args = new Object[]{label.getLabelCode(), labelType, doctor, teamCode, label.getLabelCode(), labelType, doctor, teamCode};
                        } else {
                            args = new Object[]{label.getLabelCode(), labelType, doctor,label.getLabelCode(), labelType, doctor};
                            args = new Object[]{label.getLabelCode(), labelType, doctor, label.getLabelCode(), labelType, doctor};
                        }
                    }
                }
                String sqlDoc = sql.replaceAll("repdoctor","doctor");
                String sqlDocHealth = sql.replaceAll("repdoctor","doctor_health").replaceAll("t1","t3").replaceAll("t2","t4");
                String sqlDoc = sql.replaceAll("repdoctor", "doctor");
                String sqlDocHealth = sql.replaceAll("repdoctor", "doctor_health").replaceAll("t1", "t3").replaceAll("t2", "t4");
                sql = "select count(DISTINCT t.patient) count from (" + sqlDoc + " union all " + sqlDocHealth + ") t";
@@ -853,15 +859,15 @@ public class SignPatientLabelInfoService extends BaseService {
                "    AND (t1.name like ? OR t2.label_name like ?) ";
        if (StringUtils.isNotEmpty(labelCode)) {
            args = new Object[]{labelCode, labelType, doctor, "%" + filter + "%", "%" + filter + "%",labelCode, labelType, doctor, "%" + filter + "%", "%" + filter + "%"};
            args = new Object[]{labelCode, labelType, doctor, "%" + filter + "%", "%" + filter + "%", labelCode, labelType, doctor, "%" + filter + "%", "%" + filter + "%"};
        } else if (StringUtils.isEmpty(labelCode) && StringUtils.isNotEmpty(labelType)) {
            args = new Object[]{labelType, doctor, "%" + filter + "%", "%" + filter + "%",labelType, doctor, "%" + filter + "%", "%" + filter + "%"};
            args = new Object[]{labelType, doctor, "%" + filter + "%", "%" + filter + "%", labelType, doctor, "%" + filter + "%", "%" + filter + "%"};
        } else {
            args = new Object[]{doctor, "%" + filter + "%", "%" + filter + "%",doctor, "%" + filter + "%", "%" + filter + "%"};
            args = new Object[]{doctor, "%" + filter + "%", "%" + filter + "%", doctor, "%" + filter + "%", "%" + filter + "%"};
        }
        String sqlDoc = sql.replaceAll("repdoctor","doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor","doctor_health").replaceAll("t1","t3").replaceAll("t2","t4");
        String sqlDoc = sql.replaceAll("repdoctor", "doctor");
        String sqlDocHealth = sql.replaceAll("repdoctor", "doctor_health").replaceAll("t1", "t3").replaceAll("t2", "t4");
        sql = "select t.* from (" + sqlDoc + " union all " + sqlDocHealth + ") t limit " + page + "," + pagesize;
        signList = jdbcTemplate.queryForList(sql, args);
@@ -930,6 +936,8 @@ public class SignPatientLabelInfoService extends BaseService {
                json.put("name", p.getName());
                // 设置患者手机号
                json.put("mobile", p.getMobile());
                // 设置患者微信openid
                json.put("openid", StringUtils.isNotEmpty(p.getOpenid()) ? p.getOpenid() : "");
                // 设置患者联系电话
                json.put("phone", p.getPhone());
                // 设置患者紧急联系人