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

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

@@ -531,20 +531,18 @@ public class SignPatientLabelInfoService extends BaseService {
                    //判断预警状态
                    if(standardStatus1 == standardStatus2){
                        //判断病种种类
                        if(disease1 == disease2){
                            //判断颜色标签
                            if(diseaseCondition1 == diseaseCondition2){
                        //判断颜色标签
                        if(diseaseCondition1 == diseaseCondition2){
                            //判断病种种类
                            if(disease1 == disease2){
                                //判断微信绑定情况
                                re = openid1.compareTo(openid2);
                            }else{
                                re = diseaseCondition2 - diseaseCondition1;
                                re = disease2 - disease1;
                            }
                        }else{
                            re = disease2 - disease1;
                            re = diseaseCondition2 - diseaseCondition1;
                        }
                    }else{
                        re = standardStatus1 - standardStatus2;
                    }
@@ -3878,18 +3876,19 @@ public class SignPatientLabelInfoService extends BaseService {
                    //判断预警状态
                    if(standardStatus1 == standardStatus2){
                        //判断病种种类
                        if(disease1 == disease2){
                            //判断颜色标签
                            if(diseaseCondition1 == diseaseCondition2){
                        //判断颜色标签
                        if(diseaseCondition1 == diseaseCondition2){
                            //判断病种种类
                            if(disease1 == disease2){
                                //判断微信绑定情况
                                re = openid1.compareTo(openid2);
                            }else{
                                re = diseaseCondition2 - diseaseCondition1;
                                re = disease2 - disease1;
                            }
                        }else{
                            re = disease2 - disease1;
                            re = diseaseCondition2 - diseaseCondition1;
                        }
                    }else{
@@ -4134,11 +4133,11 @@ public class SignPatientLabelInfoService extends BaseService {
                }
            }
            sql = sql + " order by t3.diseaseCondition,t3.disease,t3.diseaseCondition,t3.openid desc limit " + page + "," + pagesize;
            sql = sql + " order by t3.standard_status,t3.disease_condition,t3.disease,t3.openid desc limit " + page + "," + pagesize;
            signList = jdbcTemplate.queryForList(sql, argsnew);
        }else{
            sql = sql + " order by t3.diseaseCondition,t3.disease,t3.diseaseCondition,t3.openid desc limit " + page + "," + pagesize;
            sql = sql + " order by t3.standard_status,t3.disease_condition,t3.disease,t3.openid desc limit " + page + "," + pagesize;
            signList = jdbcTemplate.queryForList(sql, args);
        }
@@ -4342,17 +4341,16 @@ public class SignPatientLabelInfoService extends BaseService {
                " FROM " +
                "    wlyy_sign_family t1 " +
                " JOIN wlyy_patiend t2 ON t1.patient = t2.code " +
                (isIdcard ? ",wlyy_patient p " : "") +
                " WHERE " +
                (isIdcard ? " t1.patient = p.code  and " : "") +
                (isIdcard ? " t1.patient = t2.code  and " : "") +
                "    t1.status > 0 " +
                " AND t1.admin_team_code = ? " +
                "  AND" +
                (isIdcard ? " p.idcard like ? " : " t1.name like ? ");
                (isIdcard ? " t2.idcard like ? " : " t1.name like ? ");
        sqlTemp = sqlTemp + " AND p.disease_condition = "+diseaseCondition+" AND p.diease >0 AND p.status >0 ";
        sqlTemp = sqlTemp + " AND t2.disease_condition = "+diseaseCondition+" AND t2.diease >0 AND t2.status >0 ";
        String sql = sqlTemp + " order by t2.diseaseCondition,t2.disease,t2,diseaseCondition,t2.openid desc  limit " + page + "," + pagesize;
        String sql = sqlTemp + " order by t2.standard_status,t2.disease_condition,t2.disease,t2.openid desc  limit " + page + "," + pagesize;
        signList = jdbcTemplate.queryForList(sql, args);
        //查询患者设备绑定情况