Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/resident/screening/first/form/ScreenInfo.vue

@@ -526,12 +526,12 @@ export default {
                 familyHistory.includes(3) || familyHistory.includes(4) || familyHistory.includes(5) || familyHistory.includes(6))) {
                 list.push(4)
             }
-            if (((pressureOneSbp >= 130 && pressureOneSbp <= 139) || (pressureTwoSbp >=130 && pressureTwoSbp <= 139))&&
-                ((pressureOneDbp >= 85 && pressureOneDbp <= 89) || (pressureTwoDbp >=85 && pressureTwoDbp <= 89) )
+            if ((pressureOneSbp >= 130 || pressureTwoSbp >= 130) ||
+                (pressureOneDbp >= 85 || pressureTwoDbp >= 85)
             ) {
                 list.push(5)
             }
-            if (fastingGlucose>=6.1 && fastingGlucose < 7) {
+            if (fastingGlucose >= 6.1) {
                 list.push(6)
             }
             if (ldlCholesterin >= 3.4) {