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

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/DeviceService.java

@@ -450,7 +450,7 @@ public class DeviceService {
                            patient.setStandardStatus(0);
                        }
                    }else if( 3 == patient.getDisease()){
                        if( (0 == bloodSuggurBbnormalCount|| 0 == bloodPressureBbnormalCount)&& 1 == patient.getStandardStatus()){
                        if( 0 == bloodSuggurBbnormalCount && 0 == bloodPressureBbnormalCount && 1 == patient.getStandardStatus()){
                            patient.setStandardStatus(0);
                        }
                    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthIndexService.java

@@ -914,7 +914,7 @@ public class PatientHealthIndexService extends BaseService {
                    patient.setStandardStatus(0);
                }
            }else if( 3 == patient.getDisease()){
                if( (0 == bloodSuggurBbnormalCount|| 0 == bloodPressureBbnormalCount)&& 1 == patient.getStandardStatus()){
                if( 0 == bloodSuggurBbnormalCount && 0 == bloodPressureBbnormalCount && 1 == patient.getStandardStatus()){
                    patient.setStandardStatus(0);
                }
            }

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

@@ -99,7 +99,7 @@ public class DoctorSchemeService {
        }
        sql = sql + " and (sf.doctor = "+doctorcode+" or sf.doctor_health ="+doctorcode+")";
        sql = sql + " and (sf.doctor = '"+doctorcode+"' or sf.doctor_health ='"+doctorcode+"')";
        sql = sql + " and p.status > 0 and p.disease > 0 ";