问题修改

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '3377dc07-a750-48bd-965a-05a6aaee5409'
+                    token = 'bcb597e9-feeb-4d76-b22c-546c9147bee0'
                 }
             }
             if (token) {

src/doctor/followUp/generalFU/form/GeneralFUForm.vue

@@ -178,6 +178,22 @@
                                      :max-date='nextVisitDateRange.max'
                                      @confirm='dataConfirm' @cancel='showDate = false' />
                 </van-popup>
+                <!-- 快捷选项 -->
+                <van-radio-group
+                    v-model="timeCycle"
+                    shape="dot"
+                    direction="horizontal"
+                    class="w-full doc-radio-group mt-2"
+                >
+                    <van-radio
+                        v-for="item in timeCycleList"
+                        :key="item.value"
+                        :name="item.value"
+                        label-position="left"
+                    >
+                        {{ item.name }}
+                    </van-radio>
+                </van-radio-group>
             </div>
         </van-form>
 
@@ -246,6 +262,12 @@ export default {
                 min: undefined,
                 max: undefined
             },
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     watch: {
@@ -741,6 +763,24 @@ export default {
                 })
             })
         }
+    },
+    watch: {
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -789,6 +789,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1233,7 +1249,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1492,6 +1514,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -1146,6 +1146,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1584,7 +1600,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1865,6 +1887,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -793,6 +793,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1235,7 +1251,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1493,6 +1515,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -970,6 +970,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1512,6 +1528,12 @@ export default {
             showVisitDoctor: false,
             showInsulinType: false,
             // insulinDosage: []
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1784,6 +1806,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -792,6 +792,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1233,7 +1249,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1489,6 +1511,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -855,6 +855,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1341,7 +1357,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1619,6 +1641,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

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

@@ -792,6 +792,22 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 快捷选项 -->
+        <van-radio-group
+            v-model="timeCycle"
+            shape="dot"
+            direction="horizontal"
+            class="w-full doc-radio-group mt-2"
+        >
+            <van-radio
+                v-for="item in timeCycleList"
+                :key="item.value"
+                :name="item.value"
+                label-position="left"
+            >
+                {{ item.name }}
+            </van-radio>
+        </van-radio-group>
         <!-- 随访日期 -->
         <div class="label-title mt-2">随访日期</div>
         <van-field
@@ -1233,7 +1249,13 @@ export default {
             },
             showVisitUnit: false,
             showVisitOffice: false,
-            showVisitDoctor: false
+            showVisitDoctor: false,
+            timeCycle: undefined,
+            timeCycleList: [
+                { value: 1, name: '一周后' },
+                { value: 2, name: '一月后' },
+                { value: 3, name: '三月后' }
+            ]
         }
     },
     computed: {
@@ -1491,6 +1513,22 @@ export default {
                 this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
             }
         },
+        timeCycle(val) {
+            let today = new Date()
+            if (val === 1) {
+                today.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            } else if (val === 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                this.form._nextVisitDate = this.form.nextVisitDate.split('-')
+            }
+        }
     }
 }
 </script>

src/doctor/patientDetail/components/disease/Visit.vue

@@ -35,11 +35,12 @@
                         <div v-if="item.serveType === 3 || item.serveType === 4">
                             <span class="label">评估结果</span>
                             <span v-if="item.evaluationResults === 1" style="color: #D9001B">{{ item.evaluationResultsName }}</span>
-                            <span v-if="item.evaluationResults === 2" style="color: #F59A23">{{ item.evaluationResultsName }}</span>
-                            <span v-if="item.evaluationResults === 3" style="color: #70B603">{{ item.evaluationResultsName }}</span>
+                            <span v-else-if="item.evaluationResults === 2" style="color: #F59A23">{{ item.evaluationResultsName }}</span>
+                            <span v-else-if="item.evaluationResults === 3" style="color: #70B603">{{ item.evaluationResultsName }}</span>
+                            <span v-else>-</span>
                         </div>
                         <div v-if='item.bloodPressure'>
-                            <span class='label'>血压</span>
+                            <span class='label'>{{ columnTitle }}</span>
                             <span>{{ item.bloodPressure || '-' }}</span>
                         </div>
                         <div>
@@ -149,6 +150,17 @@ export default {
         },
         authInfo() {
             return this.store.authInfo
+        },
+        columnTitle() {
+            if (this.diseaseType === 2) {
+                return `空腹静脉血糖`
+            } else if (this.diseaseType === 5) {
+                return `FEV1`
+            } else if (this.diseaseType === 6) {
+                return `水肿`
+            } else {
+                return `血压`
+            }
         }
     },
     created() {