医生端 v1.2 1、复筛表单及高危随访表单bug修复

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '597477a9-728e-40c8-bd1b-08f5cb193565'
+                    token = '41c17a67-ba9d-4d08-9696-96c2f25f037a'
                 }
             }
             if (token) {

src/doctor/screening/highVisit/second/FormCont.vue

@@ -838,7 +838,7 @@
                         <van-radio-group v-model='riskScoreInfo'
                                          direction='horizontal'
                                          shape="dot"
-                                         class='w-full doc-radio-group'>
+                                         class='w-full doc-radio-group' @change='changeRiskScoreInfo'>
                             <van-radio v-for="item in store.getDict('CP00136')"
                                        :key='item.value' :name='item.value'
                                        label-position='left'>{{ item.name }}
@@ -1592,7 +1592,6 @@ export default {
         //修改时 或者引用上一次复筛数据时赋值
         setUpdateInfo() {
             this.formRight.hypertensionHighItemSelect = this.form.hypertensionHighItem || []
-            this.formRight.diabetesHighItemSelect = this.form.diabetesHighItem || []
             this.formRight.coronaryHighItemSelect = this.form.coronaryHighItem || []
             this.formRight.strokeHighItemSelect = this.form.strokeHighItem || []
             this.formRight.pulmonaryHighItemSelect = this.form.pulmonaryHighItem || []
@@ -1605,6 +1604,7 @@ export default {
             //利用setTimeout改变值的赋值顺序让这两个值在watch事件结束后再被赋值
             setTimeout(() => {
                 this.riskScoreInfo = this.form.riskScore
+                this.formRight.diabetesHighItemSelect = this.form.diabetesHighItem || []
                 this.specialScreenResultSelect = this.form.specialScreenResult || [9]
             }, 0)
 
@@ -1618,9 +1618,9 @@ export default {
             }
             //糖尿病
             if (this.form.diseaseArrays?.includes(2)) {
-                this.diabetesHigh()
                 //糖尿病风险
                 this.diabetesHighCompute()
+                this.diabetesHigh()
             }
             //冠心病
             if (this.form.diseaseArrays?.includes(3)) {
@@ -1962,8 +1962,11 @@ export default {
             if (medicineHistory.includes(4)) {
                 list.push(13)
             }
-            let socre = this.diabetesHighScore()
-            if (socre >= 25) {
+            // let socre = this.diabetesHighScore()
+            // if (socre >= 25) {
+            //     list.push(14)
+            // }
+            if (this.riskScoreInfo == 1) {
                 list.push(14)
             }
             this.formRight.diabetesHighItemSelect = Array.from(new Set(list))
@@ -2477,6 +2480,10 @@ export default {
             this.specialScreenResultSelect = this.checkboxReject(this.specialScreenResultSelect, [9])
             // this.form.specialScreenResult = this.specialScreenResultSelect
         },
+        changeRiskScoreInfo() {
+            //糖尿病风险
+            this.diabetesHigh()
+        },
         //提交
         onSubmit() {
             return new Promise((resolve, reject) => {

src/doctor/screening/second/FormCont.vue

@@ -838,7 +838,7 @@
                         <van-radio-group v-model='riskScoreInfo'
                                          direction='horizontal'
                                          shape="dot"
-                                         class='w-full doc-radio-group'>
+                                         class='w-full doc-radio-group' @change='changeRiskScoreInfo'>
                             <van-radio v-for="item in store.getDict('CP00136')"
                                        :key='item.value' :name='item.value'
                                        label-position='left'>{{ item.name }}
@@ -1592,7 +1592,6 @@ export default {
         //修改时 或者引用上一次复筛数据时赋值
         setUpdateInfo() {
             this.formRight.hypertensionHighItemSelect = this.form.hypertensionHighItem || []
-            this.formRight.diabetesHighItemSelect = this.form.diabetesHighItem || []
             this.formRight.coronaryHighItemSelect = this.form.coronaryHighItem || []
             this.formRight.strokeHighItemSelect = this.form.strokeHighItem || []
             this.formRight.pulmonaryHighItemSelect = this.form.pulmonaryHighItem || []
@@ -1605,6 +1604,7 @@ export default {
             //利用setTimeout改变值的赋值顺序让这两个值在watch事件结束后再被赋值
             setTimeout(() => {
                 this.riskScoreInfo = this.form.riskScore
+                this.formRight.diabetesHighItemSelect = this.form.diabetesHighItem || []
                 this.specialScreenResultSelect = this.form.specialScreenResult || [9]
             }, 0)
 
@@ -1618,9 +1618,9 @@ export default {
             }
             //糖尿病
             if (this.form.diseaseArrays?.includes(2)) {
-                this.diabetesHigh()
                 //糖尿病风险
                 this.diabetesHighCompute()
+                this.diabetesHigh()
             }
             //冠心病
             if (this.form.diseaseArrays?.includes(3)) {
@@ -1962,8 +1962,11 @@ export default {
             if (medicineHistory.includes(4)) {
                 list.push(13)
             }
-            let socre = this.diabetesHighScore()
-            if (socre >= 25) {
+            // let socre = this.diabetesHighScore()
+            // if (socre >= 25) {
+            //     list.push(14)
+            // }
+            if (this.riskScoreInfo == 1) {
                 list.push(14)
             }
             this.formRight.diabetesHighItemSelect = Array.from(new Set(list))
@@ -2477,6 +2480,10 @@ export default {
             this.specialScreenResultSelect = this.checkboxReject(this.specialScreenResultSelect, [9])
             // this.form.specialScreenResult = this.specialScreenResultSelect
         },
+        changeRiskScoreInfo() {
+            //糖尿病风险
+            this.diabetesHigh()
+        },
         //提交
         onSubmit() {
             return new Promise((resolve, reject) => {