diff --git a/public/index.html b/public/index.html
index 7036b53e8ad5842289390c614e33762c61d1bd16..e14406200d9bc3d6dbe86beb4ecd9f0ced7cf20c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
     <link rel='icon' href='<%= BASE_URL %>favicon.ico'>
     <title><%= htmlWebpackPlugin.options.title %></title>
     <!-- 3.3.4/vconsole.min.js -->
-    <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>
+<!--    <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>-->
 </head>
 <body>
 <noscript>
diff --git a/src/doctor/followUp/generalFU/form/BaseInfo.vue b/src/doctor/followUp/generalFU/form/BaseInfo.vue
index b1aa3327d037494823cde9c65bdb17ddc83c8863..1649b15e77fa190efea55edb9396ea269d8287d3 100644
--- a/src/doctor/followUp/generalFU/form/BaseInfo.vue
+++ b/src/doctor/followUp/generalFU/form/BaseInfo.vue
@@ -2,23 +2,23 @@
     <div>
         <van-form ref='form'>
             <div class='title'>居民信息</div>
-<!--            <div class='label-title'>证件类型</div>
-            <van-field
-                v-model='form.certificateTypeName'
-                is-link
-                readonly
-                placeholder='证件类型'
-                class='input-back mt-2 form-input'
-                :rules='rules.certificateTypeName'
-            />-->
-<!--            <div class='label-title mt-5'>证件号码</div>
-            <van-field
-                v-model='form.idCard'
-                readonly
-                placeholder='证件号码'
-                class='input-back mt-2 form-input'
-                :rules='rules.idCard'
-            />-->
+            <!--            <div class='label-title'>证件类型</div>
+                        <van-field
+                            v-model='form.certificateTypeName'
+                            is-link
+                            readonly
+                            placeholder='证件类型'
+                            class='input-back mt-2 form-input'
+                            :rules='rules.certificateTypeName'
+                        />-->
+            <!--            <div class='label-title mt-5'>证件号码</div>
+                        <van-field
+                            v-model='form.idCard'
+                            readonly
+                            placeholder='证件号码'
+                            class='input-back mt-2 form-input'
+                            :rules='rules.idCard'
+                        />-->
             <div class='label-title mt-5'>姓名</div>
             <van-field
                 v-model='form.residentName'
@@ -27,24 +27,24 @@
                 class='input-back mt-2 form-input'
                 :rules='rules.residentName'
             />
-<!--            <div class='label-title mt-5'>性别</div>
-            <van-field
-                v-model='form.genderName'
-                is-link
-                readonly
-                placeholder='性别'
-                class='input-back mt-2 form-input'
-                :rules='rules.genderName'
-            />-->
-<!--            <div class='label-title mt-5'>出生日期</div>
-            <van-field
-                v-model='form.dataBirth'
-                is-link
-                readonly
-                placeholder='出生日期'
-                class='input-back mt-2 form-input'
-                :rules='rules.dataBirth'
-            />-->
+            <!--            <div class='label-title mt-5'>性别</div>
+                        <van-field
+                            v-model='form.genderName'
+                            is-link
+                            readonly
+                            placeholder='性别'
+                            class='input-back mt-2 form-input'
+                            :rules='rules.genderName'
+                        />-->
+            <!--            <div class='label-title mt-5'>出生日期</div>
+                        <van-field
+                            v-model='form.dataBirth'
+                            is-link
+                            readonly
+                            placeholder='出生日期'
+                            class='input-back mt-2 form-input'
+                            :rules='rules.dataBirth'
+                        />-->
             <div class='label-title mt-5'>本人电话</div>
             <van-field
                 v-model='form.telephone'
@@ -71,14 +71,14 @@
                     @cancel='showNational = false'
                 />
             </van-popup>
-<!--            <div class='label-title mt-5'>年龄</div>
-            <van-field
-                v-model='form.currentAge'
-                readonly
-                placeholder='年龄'
-                class='input-back mt-2 form-input'
-                :rules='rules.currentAge'
-            />-->
+            <!--            <div class='label-title mt-5'>年龄</div>
+                        <van-field
+                            v-model='form.currentAge'
+                            readonly
+                            placeholder='年龄'
+                            class='input-back mt-2 form-input'
+                            :rules='rules.currentAge'
+                        />-->
             <div class='label-title mt-5'>现住址</div>
             <van-field
                 v-model='form.presentCodeName'
@@ -182,87 +182,29 @@
                 :rules='rules.contactPhone'
             />
             <div class='title mt-5'>随访信息</div>
-            <div class='label-title mt-5'>本次随访情况</div>
-            <van-field name='radio' :rules='rules.visitSituation' class='p-12-0'>
-                <template #input>
-                    <van-radio-group v-model='form.visitSituation' class='w-full' shape='dot'>
-
-                        <van-cell title='在访' clickable @click='form.visitSituation = 1'
-                                  class='input-back form-input'>
-                            <template #right-icon>
-                                <van-radio :name='1' />
-                            </template>
-                        </van-cell>
-                        <van-cell title='失访' clickable @click='form.visitSituation = 2'
-                                  class='input-back mt-2 form-input'>
-                            <template #right-icon>
-                                <van-radio :name='2' />
-                            </template>
-                        </van-cell>
-                    </van-radio-group>
-                </template>
-            </van-field>
-
-            <div class='label-title mt-5' v-if='form.visitSituation == 2'>失访原因</div>
-            <van-field name='radio' :rules='rules.lossReason' class='p-12-0'
-                       v-if='form.visitSituation == 2'>
-                <template #input>
-                    <van-radio-group v-model='form.lossReason' class='w-full' shape='dot'>
-
-                        <van-cell title='无法联系' clickable @click='form.lossReason = 1'
-                                  class='input-back  form-input'>
-                            <template #right-icon>
-                                <van-radio :name='1' />
-                            </template>
-                        </van-cell>
-                        <van-cell title='患者拒绝随访' clickable @click='form.lossReason = 2'
-                                  class='input-back mt-2 form-input'>
-                            <template #right-icon>
-                                <van-radio :name='2' />
-                            </template>
-                        </van-cell>
-                        <van-cell title='死亡' clickable @click='form.lossReason = 3'
-                                  class='input-back mt-2 form-input'
-                                  :style="{borderRadius: form.lossReason == 3 ? '8px 8px 0px 0px ': '8px'}"
-                        >
-                            <template #right-icon>
-                                <van-radio :name='3' />
-                            </template>
-                        </van-cell>
-                        <div class='death-r' v-if='form.lossReason == 3'>
-                            <van-field
-                                v-model='form.deathReason'
-                                clearable
-                                placeholder='死亡原因'
-                                class='input-white form-input'
-                            />
-                        </div>
-
-                        <van-cell title='其他' clickable @click='form.lossReason = 9'
-                                  class='input-back mt-2 form-input'
-                                  :style="{borderRadius: form.lossReason == 9 ? '8px 8px 0px 0px ': '8px'}"
-                        >
-                            <template #right-icon>
-                                <van-radio :name='9' />
-                            </template>
-                        </van-cell>
-                        <div class='death-r' v-if='form.lossReason == 9'>
-                            <van-field
-                                v-if='form.lossReason == 9'
-                                v-model='form.lossReasonOther'
-                                clearable
-                                placeholder='其他原因'
-                                class='input-white form-input'
-                            />
-                        </div>
-
+            <div class='label-title mt-5'>随访人群</div>
+            <van-field
+                v-model='form.groupsArraysName'
+                readonly
+                is-link
+                placeholder='请选择'
+                class='input-back mt-2 form-input'
+                :rules='rules.groupsArraysName'
+                @click='showGroupsArrays= true'
+            />
+            <van-popup v-model:show='showGroupsArrays' position='bottom'>
+                <div class='p-4'>
+                    <div class='flex justify-between mb-4'>
+                        <div class='greyColor' @click='showGroupsArrays = false'>取消</div>
+                        <div class='blueColor' @click='groupsArraysConfirm'>确认</div>
+                    </div>
+                    <CheckBtn multiple :options='groupArrList' v-model:value='checkGroupsArrays' :fieldNames="{text: 'name', value: 'value'}"/>
+                </div>
+            </van-popup>
 
-                    </van-radio-group>
-                </template>
-            </van-field>
+            <div class='label-title mt-5'>随访方式</div>
 
-            <div class='label-title mt-5' v-if='form.visitSituation == 1'>随访方式</div>
-            <van-field name='radio' :rules='rules.visitWay' class='p-12-0' v-if='form.visitSituation == 1'>
+            <van-field name='radio' :rules='rules.visitWay' class='p-12-0'>
                 <template #input>
                     <van-radio-group v-model='form.visitWay' class='w-full' shape='dot'>
 
@@ -331,14 +273,14 @@
                                 <div @click='toTel' class='tel-label'>点击拨打</div>
                             </div>
                         </div>
-<!--                        @click='form.visitWay = 9'-->
+                        <!--                        @click='form.visitWay = 9'-->
                         <van-cell title='短信(指导)' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 9 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
-                                <van-radio-group  disabled>
-                                <van-radio :name='9' />
+                                <van-radio-group disabled>
+                                    <van-radio :name='9' />
                                 </van-radio-group>
                             </template>
                         </van-cell>
@@ -372,14 +314,14 @@
                                 </van-radio-group>
                             </div>
                         </div>
-<!--                        @click='form.visitWay = 11'-->
+                        <!--                        @click='form.visitWay = 11'-->
                         <van-cell title='微信(指导)' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 11 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
-                                <van-radio-group  disabled>
-                                <van-radio :name='11' />
+                                <van-radio-group disabled>
+                                    <van-radio :name='11' />
                                 </van-radio-group>
                             </template>
                         </van-cell>
@@ -413,14 +355,14 @@
                                 </van-radio-group>
                             </div>
                         </div>
-<!--                        @click='form.visitWay = 10'-->
+                        <!--                        @click='form.visitWay = 10'-->
                         <van-cell title='短信(催检)' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 10 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
-                                <van-radio-group  disabled>
-                                <van-radio :name='10' />
+                                <van-radio-group disabled>
+                                    <van-radio :name='10' />
                                 </van-radio-group>
                             </template>
                         </van-cell>
@@ -440,14 +382,14 @@
                         <van-popup v-model:show='showTime1' position='bottom'>
                             <van-date-picker @confirm='timeConfirm1' @cancel='showBirth = false' />
                         </van-popup>
-<!--                        @click='form.visitWay = 12'-->
+                        <!--                        @click='form.visitWay = 12'-->
                         <van-cell title='微信(催检)' clickable
                                   class='input-back mt-2 form-input'
                                   :style="{borderRadius: form.visitWay == 12 ? '8px 8px 0px 0px ': '8px'}"
                         >
                             <template #right-icon>
-                                <van-radio-group  disabled>
-                                <van-radio :name='12' />
+                                <van-radio-group disabled>
+                                    <van-radio :name='12' />
                                 </van-radio-group>
                             </template>
                         </van-cell>
@@ -472,6 +414,46 @@
                 </template>
             </van-field>
 
+            <div class='label-title mt-5'>随访方式</div>
+            <van-field
+                v-model='form.visitWayRulesName'
+                readonly
+                is-link
+                placeholder='请选择'
+                class='input-back mt-2 form-input'
+                :rules='rules.visitWay'
+                @click='showVisitWay= true'
+            />
+            <van-popup v-model:show='showVisitWayRules' position='bottom'>
+                <div class='p-4'>
+                    <div class='flex justify-between mb-4'>
+                        <div class='greyColor' @click='showVisitWayRules = false'>取消</div>
+                        <div class='blueColor' @click='visitWayRulesConfirm'>确认</div>
+                    </div>
+                    <CheckBtn multiple :options='visitWayRulesList' v-model:value='checkVisitWayRules' :fieldNames="{text: 'name', value: 'value'}"/>
+                </div>
+            </van-popup>
+
+            <div class='label-title mt-5'>随访类型</div>
+            <van-field
+                v-model='form.visitWayRulesName'
+                readonly
+                is-link
+                placeholder='请选择'
+                class='input-back mt-2 form-input'
+                :rules='rules.visitWayRulesName'
+                @click='showVisitWayRules= true'
+            />
+            <van-popup v-model:show='showVisitWayRules' position='bottom'>
+                <div class='p-4'>
+                    <div class='flex justify-between mb-4'>
+                        <div class='greyColor' @click='showVisitWayRules = false'>取消</div>
+                        <div class='blueColor' @click='visitWayRulesConfirm'>确认</div>
+                    </div>
+                    <CheckBtn multiple :options='visitWayRulesList' v-model:value='checkVisitWayRules' :fieldNames="{text: 'name', value: 'value'}"/>
+                </div>
+            </van-popup>
+
         </van-form>
     </div>
 </template>
@@ -481,6 +463,7 @@ import { addToArr, fetchDataHandle } from '@/utils/common'
 import { useStore } from '@/doctor/store'
 import DocAddress from '@/components/docAddress/DocAddress'
 import dayjs from 'dayjs'
+import CheckBtn from '@/doctor/components/checkBtn/CheckBtn'
 
 const defaultForm = (info = {}) => {
     const form = {
@@ -489,40 +472,20 @@ const defaultForm = (info = {}) => {
         residentInfoId: undefined,
         // 年龄
         currentAge: undefined,
-        // 出生地详细地址
-        birthAddress: undefined,
-        // 出生地编码
-        birthCode: undefined,
         // 证件类型,[DC00004]
         certificateType: 1,
         certificateTypeName: '身份证',
         // 联系人姓名
         contactName: undefined,
-        contactName2: undefined,
         // 联系人电话
         contactPhone: undefined,
-        // 与居民关系,[DC00023]
-        contactRelation: undefined,
-        contactRelationName: undefined,
-        // 创建单位id
-        // createdUnitId: undefined,
-        // createdUnitName: undefined,
-        // 创建医生
-        // createdUserName: undefined,
         // 出生日期
         dataBirth: undefined,
-        // 职业,[DC00010]
-        duty: undefined,
-        dutyName: undefined,
-        // 文化程度(学历),[DC00007]
-        education: undefined,
-        educationName: undefined,
         // 性别,[DC00005]
         gender: undefined,
         genderName: undefined,
         // 身份证号
         idCard: undefined,
-        // innerMarital: undefined,
         // 民族,[DC00006]
         national: undefined,
         nationalName: undefined,
@@ -542,39 +505,21 @@ const defaultForm = (info = {}) => {
         residentName: undefined,
         // 本人电话
         telephone: undefined,
-        // 工作单位
-        workUnit: undefined,
-        // diseaseId: undefined,
         // 与居民关系
         relation: undefined,
         relationName: undefined,
         relationOther: undefined,
-        // 人群
-        // chronicTagsArray: undefined,
-        // 建档单位、科室、医生
-        // createDoctorId: undefined,
-        // createDoctorName: undefined,
-        // createOfficeId: undefined,
-        // createOfficeName: undefined,
-        // createUnitId: undefined,
-        // createUnitName: undefined
-        //本次随访情况
-        visitSituation: 1,
-        lossReason: undefined,
-        deathReason: undefined,
-        lossReasonOther: undefined,
-        visitWay: 5,
-        isHealthGuide: 1,
-        screenTime: new dayjs().add(1, 'day').format('YYYY-MM-DD'),
 
-        chronicCrowd: undefined,
-        chronicTagsArray: undefined,
-        firstScreenDate: undefined,
-        firstScreenResult: undefined,
-        highTagsArray: undefined,
-        highTags: undefined,
-        latelyDiagnoseDate: undefined,
-        latelyScreenDate:undefined,
+        screenTime: new dayjs().add(1, 'day').format('YYYY-MM-DD'),
+        //随访人群
+        groupsArrays: undefined,
+        groupsArraysName: undefined,
+        //随访方式
+        visitWay: undefined,
+        visitWayName: undefined,
+        //随访类型
+        visitWayRules: undefined,
+        visitWayRulesName: undefined,
     }
     Reflect.ownKeys(form).forEach(key => {
         if (info[key] != undefined) {
@@ -585,13 +530,18 @@ const defaultForm = (info = {}) => {
 }
 export default {
     name: 'BaseInfo',
-    components: { DocAddress },
+    components: { CheckBtn, DocAddress },
     props: {
         info: {
             default: () => {
                 return {}
             }
-        }
+        },
+        modeEnumList: {
+            default: () => {
+                return {}
+            }
+        },
     },
     data() {
         return {
@@ -607,6 +557,12 @@ export default {
             addressRecord: {},
             showTime1: false,
             showTime2: false,
+            showGroupsArrays: false,
+            showVisitWayRules: false,
+            //随访人群组件双向绑定变量
+            checkGroupsArrays: [],
+            //随访类型组件双向绑定变量
+            checkVisitWayRules: [],
             form: {},
             rules: {
                 certificateTypeName: [{ required: true, message: '请选择证件类型' }],
@@ -621,16 +577,44 @@ export default {
                 contactPhone: [{ required: false, message: '请填写联系电话' }],
                 presentCodeName: [{ required: true, message: '请选择所在地区' }],
                 registeredCode: [{ required: true, message: '请选择所在地区' }],
-                visitSituation: [{ required: true, message: '请选择' }],
-                lossReason: [{ required: true, message: '请选择' }],
-                visitWay: [{ required: true, message: '请选择' }]
+                groupsArraysName: [{ required: true, message: '请选择' }],
+                visitWay: [{ required: true, message: '请选择' }],
+                visitWayRulesName: [{ required: true, message: '请选择' }],
             }
         }
     },
     computed: {
         authInfo() {
             return this.store.$state.authInfo
-        }
+        },
+        //随访人群
+        groupArrList() {
+            let res = []
+            res = this.store.getDict('CP00181')
+            if (this.info?.groupsArrays) {
+                let list = this.info.groupsArrays.split(',').map(item => Number(item))
+                res.forEach(item => {
+                    item.disabled = true
+                    if (list.includes(item.value)) {
+                        item.disabled = false
+                    }
+                })
+            } else {
+                res.forEach(item => {
+                    item.disabled = true
+                })
+            }
+            return res
+        },
+        //随访类型
+        visitWayRulesList() {
+            let res = []
+            const {visitWay} = this.form
+            if (visitWay) {
+                res = this.modeEnumList.mode1.filter(item => item.value == visitWay)[0].children
+            }
+            return res
+        },
     },
     watch: {
         'info': {
@@ -706,6 +690,36 @@ export default {
             this.form.screenTime = selectedValues.join('-')
             this.showTime2 = false
         },
+        //随访人群
+        groupsArraysConfirm() {
+            let res = []
+            this.groupArrList.forEach(item => {
+               let selected = this.checkGroupsArrays.filter(i => i == item.value)
+                if (selected && selected.length) {
+                    res.push(item.name)
+                }
+            })
+            if (this.checkGroupsArrays && this.checkGroupsArrays.length) {
+                this.form.groupsArrays = this.checkGroupsArrays.join()
+                this.form.groupsArraysName = res.join()
+            }
+            this.showGroupsArrays = false
+        },
+        //随访类型
+        visitWayRulesConfirm() {
+            let res = []
+            this.visitWayRulesList.forEach(item => {
+                let selected = this.checkVisitWayRules.filter(i => i == item.value)
+                if (selected && selected.length) {
+                    res.push(item.name)
+                }
+            })
+            if (this.checkVisitWayRules && this.checkVisitWayRules.length) {
+                this.form.visitWayRules = this.checkVisitWayRules.join()
+                this.form.visitWayRulesName = res.join()
+            }
+            this.showGroupsArrays = false
+        },
         onSubmit() {
             return new Promise((resolve, reject) => {
                 this.$refs.form.validate().then(() => {
@@ -835,4 +849,14 @@ export default {
 :deep(.van-radio__icon--checked.van-radio__icon--dot) {
     background: var(--van-button-primary-background)
 }
+
+//灰色
+.greyColor {
+    color: var(--van-text-color-2);
+}
+
+//确认按钮颜色
+.blueColor {
+    color: var(--van-primary-color)
+}
 </style>
\ No newline at end of file
diff --git a/src/doctor/followUp/generalFU/form/GeneralFUForm.vue b/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
index 2fe3b7c837787eb88a1c8b92960d6938ad78cd84..30b0f4c816c289d243584ab1646e884c24e99247 100644
--- a/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
+++ b/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
@@ -2,7 +2,7 @@
     <div>
         <van-form ref='form'>
             <div class='title'>随访信息</div>
-                <div v-if='showOne && firstForm.visitSituation == 1'>
+                <div v-if='showOne'>
                     <div class='no-req-label'>随访内容</div>
                     <van-field
                         v-model='form.visitContent'
@@ -13,7 +13,7 @@
                         type='textarea'
                     />
                 </div>
-                <div v-if='showOne && firstForm.visitSituation == 1'>
+                <div v-if='showOne'>
                     <div class='no-req-label mt-5'>处置意见</div>
                     <van-field
                         v-model='form.disposalOpinion'
@@ -24,7 +24,7 @@
                         class='input-back mt-2 form-input'
                     />
                 </div>
-                <div v-if='(showOne || showTwo) && firstForm.visitSituation == 1 && firstForm.isHealthGuide == 1'>
+                <div v-if='showTwo'>
                     <div class='no-req-label mt-5'>健康指导</div>
                     <div class='health mt-2'>
                         <div class='health-cell mt-2' v-for='item in form.visitHealthGuideList'>
@@ -41,7 +41,7 @@
                     </div>
                 </div>
 
-                <div v-if='showOne && firstForm.visitSituation == 1'>
+                <div v-if='showOne'>
                     <div class='no-req-label mt-5'>上传随访记录</div>
                     <div class='tips'>
                         支持上传jpg、png、jpeg文件,大小请在10M以内
@@ -92,7 +92,7 @@
                     <div v-if='imgList.length > 6' class='warn mt-2'>最多允许上传6张!</div>
                 </div>
 
-                <div v-if='showOne && firstForm.visitSituation == 1'>
+                <div v-if='showOne'>
                     <div class='no-req-label mt-5'>现场随访照片</div>
                     <div class='tips'>
                         支持上传jpg、png、jpeg文件,大小请在10M以内
@@ -153,7 +153,7 @@
                     </div>
                 </van-overlay>
 
-                <div v-if='firstForm.visitSituation == 1'>
+                <div>
                     <div class='label-title mt-5'>下次随访日期</div>
                     <van-field
                         v-model='form.nextVisitDate'
@@ -195,7 +195,7 @@ export default {
             default: () => {
                 return {}
             }
-        }
+        },
     },
     data() {
         return {
@@ -234,29 +234,38 @@ export default {
         },
     },
     computed: {
-        //复检指导
+        //复检
         showOne() {
-            const { visitWay } = this.firstForm
+            const { visitWayRules = [] } = this.firstForm
             let res = false
-            if (visitWay == 5 || visitWay == 6 || visitWay == 7 || visitWay == 8) {
+            if (visitWayRules.includes(1)) {
                 res = true
             }
             return res
         },
-        //微信、短信指导
+        //指导
         showTwo() {
-            const { visitWay } = this.firstForm
+            const { visitWayRules = [] } = this.firstForm
             let res = false
-            if (visitWay == 9 || visitWay == 11) {
+            if (visitWayRules.includes(2)) {
                 res = true
             }
             return res
         },
-        //催检
+        //宣教
         showThree() {
-            const { visitWay } = this.firstForm
+            const {visitWayRules = []} = this.firstForm
+            let res = false
+            if (visitWayRules.includes(3)) {
+                res = true
+            }
+            return res
+        },
+        //催检
+        showFour() {
+            const { visitWayRules = [] } = this.firstForm
             let res = false
-            if (visitWay == 10 || visitWay == 12) {
+            if (visitWayRules.includes(4)) {
                 res = true
             }
             return res
diff --git a/src/doctor/followUp/generalFU/form/Index.vue b/src/doctor/followUp/generalFU/form/Index.vue
index 3bd0fe6e6ac8835a92d8d36a515c76735b59eb63..83d3a0158ee1e02015eb446d378ac65f1c359bb7 100644
--- a/src/doctor/followUp/generalFU/form/Index.vue
+++ b/src/doctor/followUp/generalFU/form/Index.vue
@@ -2,11 +2,21 @@
     <div>
         <van-nav-bar :title="routerDetail.id ? '修改通用随访': '新增通用随访'" left-text='' left-arrow @click-left='toBack'></van-nav-bar>
         <div class='p-4 h-overflow'>
-            <base-info :info='info' v-show='step == 1' ref='baseInfo'
-                       @changeVisitSituation='changeVisitSituation'></base-info>
-            <general-f-u-form :info='info' :first-form='firstForm' v-show='step == 2'
-                              ref='generalFUForm'></general-f-u-form>
-            <common-bottom :info='info' v-show='step == 3' ref='commonBottom'></common-bottom>
+            <base-info :info='info'
+                       :modeEnumList="modeEnumList"
+                       v-show='step == 1'
+                       ref='baseInfo'
+                       @changeVisitSituation='changeVisitSituation'
+            ></base-info>
+            <general-f-u-form :info='info'
+                              :first-form='firstForm'
+                              v-show='step == 2'
+                              ref='generalFUForm'
+            ></general-f-u-form>
+            <common-bottom :info='info'
+                           v-show='step == 3'
+                           ref='commonBottom'
+            ></common-bottom>
         </div>
         <div class='pt-2 pb-2'>
             <div class='px-5  grow flex flex-col justify-end' v-if='step == 1'>
@@ -47,7 +57,73 @@ import {
 } from '@/api/doctor/generalFU'
 import GeneralFUForm from '@/doctor/followUp/generalFU/form/GeneralFUForm'
 import CommonBottom from '@/doctor/followUp/generalFU/form/CommonBottom'
-
+const getModeEnum = (patientInfo = {}) => {
+    return {
+        mode1: [
+            {
+                value: '1', name: `门诊`,
+                children: [
+                    {value: 1, name: `复检`, disabled: false},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: false},
+                    {value: 4, name: `催检`, disabled: true}
+                ]
+            },
+            {
+                value: '2', name: `住院`,
+                children: [
+                    {value: 1, name: `复检`, disabled: false},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: false},
+                    {value: 4, name: `催检`, disabled: true}
+                ]
+            },
+            {
+                value: '3', name: `入户`,
+                children: [
+                    {value: 1, name: `复检`, disabled: false},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: false},
+                    {value: 4, name: `催检`, disabled: true}
+                ],
+            },
+            {
+                value: '4', name: `电话`,
+                children: [
+                    {value: 1, name: `复检`, disabled: false},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: true},
+                    {value: 4, name: `催检`, disabled: false}
+                ],
+            },
+            {
+                value: '5', name: `短信`,
+                children: [
+                    {value: 1, name: `复检`, disabled: true},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: false},
+                    {value: 4, name: `催检`, disabled: false}
+                ],
+            },
+            {
+                value: '6', name: `微信`,
+                children: [
+                    {value: 1, name: `复检`, disabled: true},
+                    {value: 2, name: `指导`, disabled: false},
+                    {value: 3, name: `宣教`, disabled: false},
+                    {value: 4, name: `催检`, disabled: false}
+                ],
+            },
+        ],
+        tel:`(本人电话:${patientInfo.telephone || ''})`,
+        weixi: `(绑定电话:${patientInfo.weixin || '未绑定'})`,
+        weixinTel: patientInfo.weixin,
+        //是否下次随访日期必填
+        nextVisitDateReq: true,
+        //催检内容是否显示患者姓名
+        urgeResidentShow: true,
+    }
+}
 export default {
     name: 'Index',
     components: { CommonBottom, GeneralFUForm, BaseInfo },
@@ -60,7 +136,8 @@ export default {
             //第一步提交的表单
             firstForm: {},
             //居民信息
-            residentInfo: {}
+            residentInfo: {},
+            modeEnumList: getModeEnum({})
         }
     },
     created() {
@@ -104,7 +181,7 @@ export default {
                 }
                 this.info.diseaseType = this.routerDetail.diseaseType
             }
-
+            this.modeEnumList = getModeEnum(this.info)
         },
         async toNext(val) {
             if (val == 2) {
diff --git a/src/doctor/workbench/tables/Visit.vue b/src/doctor/workbench/tables/Visit.vue
index 5df397c5eba06fbccda1014b93ca67a5e02c85bc..41915813fe767a19e263864ae0e84c3d856e3c97 100644
--- a/src/doctor/workbench/tables/Visit.vue
+++ b/src/doctor/workbench/tables/Visit.vue
@@ -56,7 +56,7 @@
                             <div class="bt-group">
                                 <van-button round size="small" class="doc-btn-primary">详情</van-button>
                                 <span class="mr-3"></span>
-                                <van-button round size="small" class="doc-btn-primary">通用随访</van-button>
+                                <van-button round size="small" class="doc-btn-primary" @click='toAddGeneral(item)'>通用随访</van-button>
                                 <span class="mr-3"></span>
                                 <van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
                             </div>
@@ -172,7 +172,15 @@ export default {
                     showToast('操作成功')
                 }, 800);
             })
-        }
+        },
+        //新增通用随访
+        toAddGeneral(val) {
+            const {id, ...others} = val
+            this.$router.push({
+                path: `/doctor/followUp/generalFU/add`,
+                query: {...others}
+            })
+        },
     }
 }
 </script>