diff --git a/public/index.html b/public/index.html
index 96c4443961eebad32e1f98436e68f126b946413c..027bb0152b41df2ae0434327a15086425d00a94a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
     <style>
         .loader {
             color: #1890FF;
-            font-size: .45rem;
+            font-size: 32px;
             text-indent: -9999em;
             overflow: hidden;
             width: 1em;
@@ -72,7 +72,7 @@
             }
         }
     </style>
-    <div style='height: 100%;display: flex;justify-content: center;align-items: center;'>
+    <div style='height: 100vh;display: flex;justify-content: center;align-items: center;'>
         <div class='loader'></div>
     </div>
 </div>
diff --git a/src/api/doctor/separateFU.js b/src/api/doctor/separateFU.js
index ba01b48d7f3e9d836b4c52d1c51440f82f428da8..0486cc447a0145e543562a086d3ec7d16a5a37d4 100644
--- a/src/api/doctor/separateFU.js
+++ b/src/api/doctor/separateFU.js
@@ -158,4 +158,9 @@ export function getScreenDyslipemiaLastTime(params) {
 // 引用最近一次随访记录-血脂异常
 export function getVisitDyslipemiaLastTime(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-visit-dyslipemia/reference-last-time`, body: params, loading: true })
+}
+
+// 药品列表
+export function getDrugList(params) {
+    return fetchBase({ url: `/chronic-admin/v1/base-info/phl-drug-list`, body: params })
 }
\ No newline at end of file
diff --git a/src/doctor/Doctor.vue b/src/doctor/Doctor.vue
index ebe701b24075b95e7989abe6fa7f4fa5afb1f8d8..76c9a6ddd7392a1a2f70fa77c04e0ac876f883dc 100644
--- a/src/doctor/Doctor.vue
+++ b/src/doctor/Doctor.vue
@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '009ae809-1235-4991-97be-4333260fa794'
+                    token = 'e91f5936-1adb-41bd-984b-b4e2ce5f33b2'
                 }
             }
             if (token) {
diff --git a/src/doctor/followUp/separateFU/components/DocDrug.vue b/src/doctor/followUp/separateFU/components/DocDrug.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c0a99c4a2b0afe14436d49f9a3275b303ae70845
--- /dev/null
+++ b/src/doctor/followUp/separateFU/components/DocDrug.vue
@@ -0,0 +1,139 @@
+<template>
+    <div>
+    <van-field
+        v-model='innerValueName'
+        readonly
+        is-link
+        label='药品名称:'
+        placeholder='请选择'
+        class='input-back mt-2 form-input w-full'
+        :rules="[{required: true, message:'请选择'}]"
+        @click='showDrug= true'
+    />
+    <!-- {{ array }} -->
+    <van-popup v-model:show='showDrug' position='bottom'>
+        <div class='pb-4 pr-4 pl-4'>
+            <van-picker
+                :columns='array'
+                :columns-field-names='fieldNames'
+                @confirm='drugConfirm'
+                @cancel='showDrug = false'
+            >
+                <template #columns-top>
+                    <van-search v-model="searchStr" :placeholder='placeholder' @search='onSearch' clearable/>
+                </template>
+            </van-picker>
+        </div>
+    </van-popup>
+    </div>
+</template>
+
+<script>
+
+
+import { getDrugList } from '@/api/doctor/separateFU'
+import { debounce } from '@/utils/common'
+
+export default {
+    name: 'DocDrug',
+    props: {
+        value: [String, Number],
+        valueName: String,
+        placeholder: String,
+        fieldNames: {
+            type: Object,
+            default: () => {
+                return { text: 'chemicalName', value: 'id' }
+            }
+        }
+    },
+    emits: ['update:value', 'change'],
+    data() {
+        return {
+            innerValue: null,
+            innerValueName: undefined,
+            array: [],
+            loading: false,
+            showDrug: false,
+            searchStr: ''
+        }
+    },
+    created() {
+        this.onSearch = debounce(this.onSearch, 500)
+        this.onSearch('')
+    },
+    methods: {
+        onSearch(value) {
+            if (this.loading) return
+            this.array = []
+            if (!value) {
+                return
+            }
+            if (!value.trim()) return
+            this.loading = true
+            getDrugList({ pinyinCode: value }).then(res => {
+                this.array = res.data || []
+                if (this.array.length && this.innerValue) {
+                   let list = this.array.filter(item => item.id == this.innerValue)
+                    if (list && list.length) {
+                        this.innerValueName = list[0].chemicalName
+                    }
+                }
+            }).finally(() => {
+                this.loading = false
+            })
+        },
+        drugConfirm({ selectedOptions }) {
+            this.innerValueName = selectedOptions[0].chemicalName
+            this.$emit('update:value', selectedOptions[0].id)
+            this.$emit('change', selectedOptions[0])
+            this.searchStr = ''
+            this.showDrug = false
+        }
+    },
+    watch: {
+        value: {
+            handler(value) {
+                this.innerValue = value
+            },
+            immediate: true
+        },
+        valueName: {
+            handler(value) {
+                if (!value) {
+                    return
+                }
+                this.onSearch(value)
+            },
+            immediate: true
+        },
+        searchStr: {
+            handler(val) {
+                if (!val) return
+                this.onSearch(val)
+            }
+        }
+    }
+}
+</script>
+
+<style lang='less' scoped>
+.form-input {
+    padding: 8px 12px;
+    border-radius: 8px;
+}
+
+.input-back {
+    background: #FAFAFA;
+}
+
+//灰色
+.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/separateFU/components/FormCommon.vue b/src/doctor/followUp/separateFU/components/FormCommon.vue
deleted file mode 100644
index 27e0f69560f56756864c96333af83d5c1d4db770..0000000000000000000000000000000000000000
--- a/src/doctor/followUp/separateFU/components/FormCommon.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    
-</template>
\ No newline at end of file
diff --git a/src/doctor/followUp/separateFU/components/HypertensionDrugs.vue b/src/doctor/followUp/separateFU/components/HypertensionDrugs.vue
index eaf5a7e533b8f991f9b7b5eda4c98ecf7e6e9d3f..d82d5b5ea473367010244e8c5924bcbcbb1ac8b5 100644
--- a/src/doctor/followUp/separateFU/components/HypertensionDrugs.vue
+++ b/src/doctor/followUp/separateFU/components/HypertensionDrugs.vue
@@ -294,7 +294,7 @@
 </template>
 <script>
 import { useStore } from '@/doctor/store'
-import DocDrug from '@/doctor/components/docDrug/DocDrug.vue'
+import DocDrug from './DocDrug.vue'
 import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
 export default {
     name: 'HypertensionDrugs',
@@ -414,10 +414,18 @@ export default {
             handler() {
                 let { currentMedicateCase, addMedicateCase, noComplianceReason } = this.form
                 if (currentMedicateCase) {
-                    this.currentMedicateCase = JSON.parse(currentMedicateCase)
+                    this.currentMedicateCase = JSON.parse(currentMedicateCase) || {}
+                    this.currentMedicateCase.unitName = this.currentMedicateCase.unitName || this.store.getDictValue('CP00081', this.currentMedicateCase.unit)
+                    this.currentMedicateCase.frequencyName = this.currentMedicateCase.frequencyName || this.store.getDictValue('CP00084', this.currentMedicateCase.frequency)
+                    this.currentMedicateCase.usageName = this.currentMedicateCase.usageName || this.store.getDictValue('CP00083', this.currentMedicateCase.usage)
                 }
                 if (addMedicateCase) {
-                    this.addMedicateCase = JSON.parse(addMedicateCase)
+                    this.addMedicateCase = JSON.parse(addMedicateCase) || []
+                    this.addMedicateCase.map(item => {
+                        item.unitName = item.unitName || this.store.getDictValue('CP00081', item.unit)
+                        item.frequencyName = item.frequencyName || this.store.getDictValue('CP00084', item.frequency)
+                        item.usageName = item.usageName || this.store.getDictValue('CP00083', item.usage)
+                    })
                 }
                 if (noComplianceReason) {
                     this.form.noComplianceReason = noComplianceReason.split(',').map(e => +e)
diff --git a/src/doctor/followUp/separateFU/components/TreatmentPlan.vue b/src/doctor/followUp/separateFU/components/TreatmentPlan.vue
index 19435bbd59fe47b0e64fe5aaa75323cb067f3a59..d420bc93de5e2c2df2f4519ff4d3af01acc9e068 100644
--- a/src/doctor/followUp/separateFU/components/TreatmentPlan.vue
+++ b/src/doctor/followUp/separateFU/components/TreatmentPlan.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="label-title mt-2">{{ firstText }}</div>
     <div class="bg-fa">
-        <div class="label-title" required style="font-size: 14px; color: #262626; line-height: 24px">{{ secondText }}</div>
-        <van-field :rules="[{ required: true, message: '请选择' }]" style="padding: 0" class="mt-2">
+        <div class="label-title" style="font-size: 14px; color: #262626; line-height: 24px">{{ secondText }}</div>
+        <van-field style="padding: 0" class="mt-2">
             <template #input>
                 <van-radio-group
                     v-model="form.adjustTreat"
@@ -133,7 +133,7 @@
 </template>
 <script>
 import { useStore } from '@/doctor/store'
-import DocDrug from '@/doctor/components/docDrug/DocDrug.vue'
+import DocDrug from './DocDrug.vue'
 import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
 export default {
     components: { DocDrug, CheckBtn },
@@ -218,7 +218,12 @@ export default {
     watch: {
         'form.medicateCase': {
             handler() {
-                this.medicateCase = JSON.parse(this.form.medicateCase)
+                this.medicateCase = JSON.parse(this.form.medicateCase) || []
+                this.medicateCase.map(item => {
+                    item.unitName = item.unitName || this.store.getDictValue('CP00081', item.unit)
+                    item.frequencyName = item.frequencyName || this.store.getDictValue('CP00084', item.frequency)
+                    item.usageName = item.usageName || this.store.getDictValue('CP00083', item.usage)
+                })
             }
         }
     }
diff --git a/src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue b/src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue
index 65b6757e97cd2b5822ed7ae252d218c57c858fb9..377ed918fa9894c5aae945b87a64d58b2ac30e0b 100644
--- a/src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue
@@ -306,6 +306,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -317,6 +318,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
diff --git a/src/doctor/followUp/separateFU/detail/components/CopdDetail.vue b/src/doctor/followUp/separateFU/detail/components/CopdDetail.vue
index df9fc363731096cf31056fda48677ff7fffef6a1..ee8e284e0e6ea19d84ad4f06d0010df398324dea 100644
--- a/src/doctor/followUp/separateFU/detail/components/CopdDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/CopdDetail.vue
@@ -72,12 +72,25 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="5" title="生活方式指导" name="5">
+                <van-collapse-item key="5" title="合并症" name="5">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div style="color: #262626">吸烟</div>
-                    <div class="gray-box mt-2">
+                    <div class="list">
+                        <div class="flex justify-between py-1 border-bottom item">
+                            <span class="shrink-0 mr-2 label">合并症</span>
+                            <span class="text-end">
+                                {{ visitInfo.complicationName || '-' }}
+                            </span>
+                        </div>
+                    </div>
+                </van-collapse-item>
+                <van-collapse-item key="6" title="生活方式指导" name="6">
+                    <template #right-icon>
+                        <doc-icon type="doc-down" />
+                    </template>
+                    <div class="py-1">吸烟</div>
+                    <div class="gray-box">
                         <div>
                             <span>是否正在吸烟:</span>
                             <span>{{ visitInfo.isSmokingName }}</span>
@@ -93,44 +106,15 @@
                         <div v-if="visitInfo.isSmoking === 1 || visitInfo.isSmoking === 2">
                             <span>日吸烟量:</span>
                             <span>{{ visitInfo.daySmoking || '-' }}支</span>
-                            <!-- <span class="ml-4">目标日吸烟量:</span>
-                            <span>{{ visitInfo.goalDaySmoking || '-' }}支</span> -->
                         </div>
                         <div v-if="visitInfo.isSmoking === 1 || visitInfo.isSmoking === 2">
                             <span>目标日吸烟量:</span>
                             <span>{{ visitInfo.goalDaySmoking || '-' }}支</span>
                         </div>
                     </div>
-                    <div style="color: #262626" class="mt-2">饮酒</div>
-                    <div class="gray-box mt-2">
-                        <div>
-                            <span>是否正在饮酒:</span>
-                            <span>{{ visitInfo.isDrinkName }}</span>
-                        </div>
-                        <div v-if="visitInfo.isDrink === 1 || visitInfo.isDrink === 2">
-                            <span>日饮酒量:</span>
-                            <span>{{ visitInfo.dayDrink || '-' }}ml</span>
-                            <span class="ml-4">目标日饮酒量:</span>
-                            <span>{{ visitInfo.goalDayDrink || '-' }}ml</span>
-                        </div>
-                        <div v-if="visitInfo.isDrink === 1 || visitInfo.isDrink === 2">
-                            <span>白酒:</span>
-                            <span>{{ visitInfo.drinkLiquor || '-' }}ml/日</span>
-                            <span class="ml-2">啤酒:</span>
-                            <span>{{ visitInfo.drinkBeer || '-' }}ml/日</span>
-                            <span class="ml-2">红酒:</span>
-                            <span>{{ visitInfo.drinkRed || '-' }}ml/日</span>
-                            
-                        </div>
-                        <div v-if="visitInfo.isDrink === 1 || visitInfo.isDrink === 2">
-                            <span>黄酒:</span>
-                            <span>{{ visitInfo.drinkYellow || '-' }}ml/日</span>
-                            <span class="ml-2">其他:</span>
-                            <span>{{ visitInfo.drinkOther || '-' }}ml/日</span>
-                        </div>
-                    </div>
-                    <div style="color: #262626" class="mt-2">运动</div>
-                    <div class="gray-box mt-2">
+                    
+                    <div class="py-1">运动</div>
+                    <div class="gray-box">
                         <div>
                             <span>有无规律活动:</span>
                             <span>{{ visitInfo.regularExerciseName }}</span>
@@ -150,10 +134,22 @@
                             <span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
                         </div>
                     </div>
+                    <div class="py-1">呼吸锻炼</div>
+                    <div class="gray-box">
+                        <div>
+                            <span>有无呼吸锻炼:</span>
+                            <span>{{ visitInfo.isBreathExerciseName }}</span>
+                        </div>
+                        <div v-if="visitInfo.isBreathExercise === 1">
+                            <span>呼吸锻炼频率:</span>
+                            <span>{{ visitInfo.breathExerciseWeek }}次/周、</span>
+                            <span>{{ visitInfo.breathExerciseMinute }}分钟/次</span>
+                        </div>
+                    </div>
                     <div class="list mt-2">
                         <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">摄盐情况(咸淡)</span>
-                            <span class="text-end">{{ visitInfo.saltIntakeName || '-' }}</span>
+                            <span class="shrink-0 mr-2 label">健康教育</span>
+                            <span class="text-end">{{ visitInfo.healthEducationName || '-' }}</span>
                         </div>
                         <div class="flex justify-between py-1 border-bottom item">
                             <span class="shrink-0 mr-2 label">心理调整</span>
@@ -164,8 +160,22 @@
                             <span class="text-end">{{ visitInfo.doctorAdviceName || '-' }}</span>
                         </div>
                     </div>
+                    <div class="list">
+                        <div class="flex justify-between py-1 border-bottom item">
+                            <span class="shrink-0 mr-2 label">疫苗免疫史</span>
+                            <span class="text-end">
+                                {{ visitInfo.vaccinesHistoryName || '-' }}
+                            </span>
+                        </div>
+                        <div v-if="visitInfo.vaccinesHistory === 1" class="flex justify-between py-1 border-bottom item">
+                            <span class="shrink-0 mr-2 label">疫苗名称</span>
+                            <span class="text-end">
+                                {{ visitInfo.vaccinesHistoryHaveName || '-' }}
+                            </span>
+                        </div>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="6" title="辅助检查" name="6">
+                <van-collapse-item key="7" title="辅助检查" name="7">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -188,7 +198,7 @@
                         </div>
                     </template>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="服药依从性" name="7">
+                <van-collapse-item key="8" title="服药依从性" name="8">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -199,7 +209,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="8" title="药物不良反应" name="8">
+                <van-collapse-item key="9" title="药物不良反应" name="9">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -214,7 +224,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="9" title="此次随访分类" name="9">
+                <van-collapse-item key="10" title="此次随访分类" name="10">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -225,7 +235,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="10" title="目前诊断" name="10">
+                <van-collapse-item key="11" title="目前诊断" name="11">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -236,7 +246,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="11" title="用药情况" name="11">
+                <van-collapse-item key="12" title="用药情况" name="12">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -260,7 +270,7 @@
                         </div>
                     </template>
                 </van-collapse-item>
-                <van-collapse-item key="12" title="其他治疗" name="12">
+                <van-collapse-item key="13" title="其他治疗" name="13">
                     <div class="py-1">家庭氧疗</div>
                     <div class="gray-box">
                         <div>每日:{{ visitInfo.otEveryday || '-' }} 小时</div>
@@ -279,7 +289,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="13" title="转诊" name="13">
+                <van-collapse-item key="14" title="转诊" name="14">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -302,13 +312,13 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="14" title="现场随访照片" name="14">
+                <van-collapse-item key="15" title="现场随访照片" name="15">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
                     <ImagePreview :img-list="visitInfo.visitImageList"></ImagePreview>
                 </van-collapse-item>
-                <van-collapse-item key="15" title="下次随访日期" name="15">
+                <van-collapse-item key="16" title="下次随访日期" name="16">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -319,7 +329,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="16" title="随访机构" name="16">
+                <van-collapse-item key="17" title="随访机构" name="17">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
@@ -337,6 +347,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -348,6 +359,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
@@ -423,7 +435,7 @@ export default {
                 this.activeCollapse = []
             } else {
                 let list = []
-                for (let i = 1; i < 17; i++) {
+                for (let i = 1; i < 18; i++) {
                     list.push(i.toString())
                 }
                 this.activeCollapse = list
@@ -443,7 +455,7 @@ export default {
                     this.activeCollapse = val.slice(val.length - 1)
                 }
             }
-            if (val.length === 16) {
+            if (val.length === 17) {
                 this.collapseAll = true
             } else {
                 this.collapseAll = false
diff --git a/src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue b/src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue
index fb50c8501037692978913aa3707424641d03d532..2b702add9948a7dfc18b140f90c5fd6d2467c5fb 100644
--- a/src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue
@@ -234,16 +234,19 @@
                             <span class="text-end">{{ visitInfo.adjustTreatName }}</span>
                         </div>
                     </div>
-                    <div v-for="(item, index) in medicateCase" :key="index" class="gray-box mb-2">
-                        <div>药物名称:{{ item.drugName }}</div>
-                        <div>
-                            <span>剂量:</span>
-                            <span>{{ item.dose }}</span>
-                            <span class="ml-1">{{ item.unitName }}</span>
+                    <template v-if="visitInfo.adjustTreat === 1">
+                        <div class="py-1">用药方案</div>
+                        <div v-for="(item, index) in medicateCase" :key="index" class="gray-box mb-2">
+                            <div>药物名称:{{ item.drugName }}</div>
+                            <div>
+                                <span>剂量:</span>
+                                <span>{{ item.dose }}</span>
+                                <span class="ml-1">{{ item.unitName || store.getDictValue('CP00081', item.unit) }}</span>
+                            </div>
+                            <div>频次:{{ item.frequencyName || store.getDictValue('CP00084', item.frequency) }}</div>
+                            <div>用法:{{ item.usageName || store.getDictValue('CP00083', item.usage) }}</div>
                         </div>
-                        <div>频次:{{ item.frequencyName }}</div>
-                        <div>用法:{{ item.usageName }}</div>
-                    </div>
+                    </template>
                 </van-collapse-item>
                 <van-collapse-item key="12" title="转诊" name="12">
                     <template #right-icon>
@@ -303,6 +306,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -314,6 +318,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
diff --git a/src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue b/src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue
index 06cd6b1aac842889a7fa8027d778ea8780d0a899..f05d79ac6447831afe6e33a497325ba161e70353 100644
--- a/src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue
@@ -348,6 +348,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -359,6 +360,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
diff --git a/src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue b/src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue
index 98108f2602c944188ac9d482e81cbff5d02109e6..3987818613986ac758d1e352a9f46effc8cdb1ac 100644
--- a/src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue
@@ -306,6 +306,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -317,6 +318,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
diff --git a/src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue b/src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue
index f939cf6d1f07b732f2637df7cb91dff663d17c31..9dc40daadabeb7dbac347b340aa5d44266434fee 100644
--- a/src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue
@@ -172,17 +172,6 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <!-- <div class="list">
-                        <div v-for="item in columnsAuxiliary" :key="item.key">
-                            <div class="flex justify-between py-1 border-bottom item">
-                                <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                                <span class="text-end">
-                                    <span>{{ visitInfo[item.key] || '-' }}</span>
-                                    <span v-if="item.unit" class="ml-1">{{ item.unit }}</span>
-                                </span>
-                            </div>
-                        </div>
-                    </div> -->
                     <div v-for="(x, xIndex) in inspectList" :key="xIndex">
                         <div style="color: #262626" :class="[xIndex === 0 ? '' : 'mt-2']">{{ x.insName }}</div>
                         <div class="gray-box mt-1">
diff --git a/src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue b/src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue
index 2a86f6eebad65ffca82f4e6c777520378c28bb3b..bd04cd88cd7148ed5a5b8d06f07117815abbe63c 100644
--- a/src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue
+++ b/src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue
@@ -228,6 +228,25 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div class="list">
+                        <div class="flex justify-between py-1 border-bottom item">
+                            <span class="shrink-0 mr-2 label">是否调整治疗方案</span>
+                            <span class="text-end">{{ visitInfo.adjustTreatName }}</span>
+                        </div>
+                    </div>
+                    <template v-if="visitInfo.adjustTreat === 1">
+                        <div class="py-1">用药方案</div>
+                        <div v-for="(item, index) in medicateCase" :key="index" class="gray-box mb-2">
+                            <div>药物名称:{{ item.drugName }}</div>
+                            <div>
+                                <span>剂量:</span>
+                                <span>{{ item.dose }}</span>
+                                <span class="ml-1">{{ item.unitName || store.getDictValue('CP00081', item.unit) }}</span>
+                            </div>
+                            <div>频次:{{ item.frequencyName || store.getDictValue('CP00084', item.frequency) }}</div>
+                            <div>用法:{{ item.usageName || store.getDictValue('CP00083', item.usage) }}</div>
+                        </div>
+                    </template>
                 </van-collapse-item>
                 <van-collapse-item key="12" title="转诊" name="12">
                     <template #right-icon>
@@ -287,6 +306,7 @@
     </div>
 </template>
 <script>
+import { useStore } from '@/doctor/store'
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
 export default {
     components: { ImagePreview },
@@ -298,6 +318,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
@@ -339,7 +360,14 @@ export default {
         },
         inspectList() {
             return this.visitInfo.inspectList || []
-        }
+        },
+        medicateCase() {
+            if (this.visitInfo.medicateCase) {
+                return JSON.parse(this.visitInfo.medicateCase)
+            } else {
+                return []
+            }
+        },
     },
     methods: {
         // 全部展开、收起