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

 Conflicts:
	src/doctor/Doctor.vue

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

@@ -524,15 +524,15 @@ export default {
         },
         resultHandle() {
             const {currentAge, height = 0, weight = 0, waistline, familyHistory = [], isSmoking, gender,
-                pressureOneSbp, pressureOneDbp, pressureTwoSbp, pressureTwoDbp, fastingGlucose, ldlCholesterin} = this.form
+                pressureOneSbp, pressureOneDbp, pressureTwoSbp, pressureTwoDbp, fastingGlucose, ldlCholesterin, serumCholesterin} = this.form
             let list = []
             if (currentAge >= 50) {
                 list.push(1)
             }
             let bmi = parseFloat(this.bmi)
             if ((bmi >= 24)||
-                (gender == 2 && waistline >=85) ||
-                (gender == 1 && waistline >=90) ){
+                (gender == 2 && waistline >=80) ||
+                (gender == 1 && waistline >=85) ){
                 list.push(2)
             }
             if (isSmoking == 1) {
@@ -550,7 +550,10 @@ export default {
             if (fastingGlucose >= 6.1) {
                 list.push(6)
             }
-            if (ldlCholesterin >= 3.4) {
+            // if (ldlCholesterin >= 3.4) {
+            //     list.push(7)
+            // }
+            if (serumCholesterin >= 5.2) {
                 list.push(7)
             }
             list =  Array.from(new Set(list))