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

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftService.java

@@ -120,8 +120,8 @@ public class ZysoftService {
        paramsList.put("msgHeader",msgHeader);
        paramsList.put("msgBody",msgBody);
        System.out.print("msgHeader:"+msgHeader+"\r\n");
        System.out.print("msgBody:"+msgBody+"\r\n");
//        System.out.print("msgHeader:"+msgHeader+"\r\n");
//        System.out.print("msgBody:"+msgBody+"\r\n");
        //新增日志
        String method = "POST";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@@ -79,7 +79,7 @@ public class DoctorSchemeService {
            sql = sql + " LEFT JOIN wlyy_patient_device dev on dev.user = p.code ";
        }
        sql = sql+ " JOIN wlyy_sign_family sf on sf.patient = p.code where sf.admin_team_code = "+teamCode;
        sql = sql+ " LEFT wlyy_sign_family sf on sf.patient = p.code where sf.admin_team_code = "+teamCode;
        if(-1 != disease){
            sql = sql + " and (p.disease ="+disease+" or p.disease = 3) ";
@@ -103,7 +103,7 @@ public class DoctorSchemeService {
        sql = sql + " and (sf.doctor = '"+doctorcode+"' or sf.doctor_health ='"+doctorcode+"')";
        sql = sql + " and p.status > 0 and p.disease > 0 ";
        sql = sql + " and p.status > 0 and p.disease > 0 and sf.status > 0 ";
        List<String> result = jdbcTemplate.queryForList(sql,new Object[]{},String.class);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -465,7 +465,7 @@ public class AdminTeamService extends BaseService {
        SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
        //判断团队关系
        if(jtSign!=null&&doctorTeam!=null&&jtSign.getAdminTeamId().compareTo(doctorTeam.getId())==0){
        if(jtSign!=null&&doctorTeam!=null&&(jtSign.getAdminTeamId() !=null && jtSign.getAdminTeamId().compareTo(doctorTeam.getId())==0)){
            return result.put(new JSONObject(doctorTeam));
        }
        //判断签约关系

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

@@ -858,8 +858,7 @@ public class PatientService extends TokenService {
                "    wlyy_sign_family f ,wlyy_patient p " +
                "   WHERE " +
                "   f.patient = p.code ";
        //获取微信关注量分组数量
        fousGSql = fousGSql +"   AND p.openid IS NOT NULL AND p.openid <>'' " ;
        //判断是否是慢病管理
        if(isSlowDisease){
@@ -869,6 +868,14 @@ public class PatientService extends TokenService {
        if(StringUtils.isNotBlank(diseaseCondition)){
            fousGSql = fousGSql +"   AND p.disease_condition = "+diseaseCondition;
        }
        if(isSlowDisease){
            //慢病管理预警居民分数数量
            fousGSql = fousGSql +"   AND p.standard_status = 1 ";
        }else{
            //获取微信关注量分组数量
            fousGSql = fousGSql +"   AND p.openid IS NOT NULL AND p.openid <>'' " ;
        }
        fousGSql = fousGSql +
                "   AND ( " +
                "     f.doctor = '" + doctor + "' " +