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

@@ -427,7 +427,7 @@ public class DeviceService {
                //连续3次异常，修改用户为预警状态
                if( (bloodPressureBbnormalCount >=3 || bloodSuggurBbnormalCount >=3) && 0 == patient.getStandardStatus()){
                if( (bloodPressureBbnormalCount >=3 || bloodSuggurBbnormalCount >=3) && (patient.getStandardStatus() == null || 0 == patient.getStandardStatus())){
                    patient.setStandardStatus(1);
                }else{
                    Date end = new Date();
@@ -442,15 +442,15 @@ public class DeviceService {
                //连续5次正常，修改用户为非预警状态
                if(patient.getDisease() != null){
                    if( 1 == patient.getDisease()){
                        if(0 == bloodPressureBbnormalCount && 1 == patient.getStandardStatus()){
                        if(0 == bloodPressureBbnormalCount && (patient.getStandardStatus() == null || 1 == patient.getStandardStatus())){
                            patient.setStandardStatus(0);
                        }
                    }else if(2 == patient.getDisease()){
                        if(0 == bloodSuggurBbnormalCount && 1 == patient.getStandardStatus()){
                        if(0 == bloodSuggurBbnormalCount && (patient.getStandardStatus() == null || 1 == patient.getStandardStatus())){
                            patient.setStandardStatus(0);
                        }
                    }else if( 3 == patient.getDisease()){
                        if( 0 == bloodSuggurBbnormalCount && 0 == bloodPressureBbnormalCount && 1 == patient.getStandardStatus()){
                        if( 0 == bloodSuggurBbnormalCount && 0 == bloodPressureBbnormalCount && (patient.getStandardStatus() == null || 1 == patient.getStandardStatus())){
                            patient.setStandardStatus(0);
                        }
                    }

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

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