修改代码冲突

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

@@ -833,7 +833,7 @@ public class PatientHealthIndexService extends BaseService {
        //连续3次异常，修改用户为预警状态
        if( (3 >= bloodPressureBbnormalCount || 3 >= bloodSuggurBbnormalCount) && 0 == patient.getStandardStatus()){
        if( (bloodPressureBbnormalCount >=3 || bloodSuggurBbnormalCount >=3) && 0 == patient.getStandardStatus()){
            patient.setStandardStatus(1);
        }else{
            Date end = new Date();