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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/Doctor.vue

@@ -66,8 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    // token = '9486b3ed-332d-4a2e-86dc-0502a3e2bd69'
-                    token = 'f5a73526-7770-4725-a469-6df4db1bf341'
+                    token = '009ae809-1235-4991-97be-4333260fa794'
                 }
             }
             if (token) {

src/doctor/followUp/separateFU/form/components/ChronicKidneyDiseaseForm.vue

@@ -902,10 +902,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },

src/doctor/followUp/separateFU/form/components/CoronaryHeartDiseaseForm.vue

@@ -906,10 +906,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },

src/doctor/followUp/separateFU/form/components/DiabetesForm.vue

@@ -1083,10 +1083,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },

src/doctor/followUp/separateFU/form/components/DyslipidemiaForm.vue

@@ -905,10 +905,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },

src/doctor/followUp/separateFU/form/components/HypertensionForm.vue

@@ -970,10 +970,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },

src/doctor/followUp/separateFU/form/components/StrokeForm.vue

@@ -905,10 +905,32 @@ export default {
                     { required: true, message: '请选择症状' }
                 ],
                 signSystolicPressure: [
-                    { required: true, message: '请填写收缩压' }
+                    { required: true, message: '请填写收缩压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 60 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入60到300之间的整数`
+                    }
                 ],
                 signDiastolicPressure: [
-                    { required: true, message: '请填写舒张压' }
+                    { required: true, message: '请填写舒张压' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 30 && Number(value) <= 300)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入30到300之间的整数`
+                    }
                 ],
                 signHeight: [
                     { required: true, message: '请填写身高' },