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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/followUp/separateFU/components/Inspect.vue

@@ -90,11 +90,10 @@
                 <div v-if="y.itemValue === 2" style="background-color: #fff; padding: 8px; border-radius: 8px" class="mt-2">
                     <div class="label-title">影像报告</div>
                     <DocImageUpload
-                        description="温馨提示：请上传JPG、PNG格式图片，文件大小不超过10M"
-                        lengthMessage="抱歉，最多可上传8个文件。"
+                        description="最多支持上传4个文件，支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，文件大小请勿超过10M。"
                         :imageData="y.picturesList" 
                         @change="(ids, option) => y.img = ids"
-                        :maxLength="8">
+                        :maxLength="4">
                     </DocImageUpload>
                 </div>
             </template>

src/doctor/followUp/separateFU/components/InspectV2.vue

@@ -17,6 +17,7 @@
             />
             <div style="color: #262626; font-size: 14px; margin-top: 8px">上传报告</div>
             <DocImageUpload
+                description="最多支持上传4个文件，支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，文件大小请勿超过10M。"
                 :imageData="item.picturesList"
                 @change="(ids, option) => item.img = ids"
                 :maxLength="4"

src/doctor/followUp/separateFU/components/TreatmentPlan.vue

 <template>
-    <div class="label-title mt-2">治疗方案</div>
+    <div class="label-title mt-2">{{ firstText }}</div>
     <div class="bg-fa">
-        <div style="font-size: 14px">是否调整治疗方案</div>
-        <van-field style="padding: 0" class="mt-2">
+        <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">
             <template #input>
                 <van-radio-group
                     v-model="form.adjustTreat"
@@ -141,6 +141,10 @@ export default {
         form: {
             type: Object,
             default: () => {}
+        },
+        diseaseInfo: {
+            type: Object,
+            default: () => {}
         }
     },
     data() {
@@ -152,6 +156,24 @@ export default {
             medicateCase: [{}]
         }
     },
+    computed: {
+        firstText() {
+            let { diseaseType } = this.diseaseInfo
+            if (diseaseType === 1) {
+                return `药物治疗`
+            } else {
+                return `治疗方案`
+            }
+        },
+        secondText() {
+            let { diseaseType } = this.diseaseInfo
+            if (diseaseType === 1) {
+                return `本次就诊后的药物治疗方案（仅录入降压、降脂及抗血小板药物，在目前用药列表中进行增删）`
+            } else {
+                return `是否调整治疗方案`
+            }
+        }
+    },
     methods: {
         drugChange(option, item) {
             item.drugName = option.chemicalName

src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue

@@ -169,12 +169,23 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
+                        <div>检查名称：{{ x.itemName }}</div>
+                        <div>检查结果：{{ x.itemValue }}</div>
+                        <div>影像报告：</div>
+                        <ImagePreview :img-list="x.picturesList"></ImagePreview>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
+                <van-collapse-item key="7" title="服药依从性" name="7">
                     <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.medicationComplianceName }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -300,16 +311,17 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
                 { title: '舒张压DBP', key: 'signDiastolicPressure', unit: 'mmHg' },
-                { title: '身高', key: 'signHeight', unit: 'cm' },
-                { title: '体重', key: 'signWeight', unit: 'kg' },
-                { title: 'BMI', key: 'signBmi', unit: 'kg/m²' },
-                { title: '腰围', key: 'signWaistline', unit: 'cm' },
                 { title: '心率', key: 'signHeartRate', unit: '次/分' },
+                { title: '体重', key: 'signWeight', unit: 'kg' },
+                { title: '水肿', key: 'signEdemaName' },
                 { title: '其他', key: 'signOther' }
             ],
             columnsOrg: [
@@ -323,6 +335,9 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            return this.visitInfo.inspectList || []
         }
     },
     methods: {

src/doctor/followUp/separateFU/detail/components/CopdDetail.vue

@@ -169,12 +169,23 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
+                        <div>检查名称：{{ x.itemName }}</div>
+                        <div>检查结果：{{ x.itemValue }}</div>
+                        <div>影像报告：</div>
+                        <ImagePreview :img-list="x.picturesList"></ImagePreview>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
+                <van-collapse-item key="7" title="服药依从性" name="7">
                     <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.medicationComplianceName }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -300,16 +311,20 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
-                { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
-                { title: '舒张压DBP', key: 'signDiastolicPressure', unit: 'mmHg' },
                 { title: '身高', key: 'signHeight', unit: 'cm' },
                 { title: '体重', key: 'signWeight', unit: 'kg' },
                 { title: 'BMI', key: 'signBmi', unit: 'kg/m²' },
-                { title: '腰围', key: 'signWaistline', unit: 'cm' },
-                { title: '心率', key: 'signHeartRate', unit: '次/分' },
+                { title: '呼吸频率', key: 'respiratoryRate', unit: '次/分钟' },
+                { title: '心率', key: 'heartRate', unit: '次/分' },
+                { title: '口唇紫绀', key: 'signCyanosisName' },
+                { title: '下肢水肿', key: 'signEdemaName' },
+                { title: '外周水肿', key: 'peripheralEdemaName' },
                 { title: '其他', key: 'signOther' }
             ],
             columnsOrg: [
@@ -323,6 +338,9 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            return this.visitInfo.inspectList || []
         }
     },
     methods: {

src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue

@@ -169,12 +169,23 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
+                        <div>检查名称：{{ x.itemName }}</div>
+                        <div>检查结果：{{ x.itemValue }}</div>
+                        <div>影像报告：</div>
+                        <ImagePreview :img-list="x.picturesList"></ImagePreview>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
+                <van-collapse-item key="7" title="服药依从性" name="7">
                     <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.medicationComplianceName }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -217,6 +228,22 @@
                     <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>
+                    <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>
+                        </div>
+                        <div>频次：{{ item.frequencyName }}</div>
+                        <div>用法：{{ item.usageName }}</div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="12" title="转诊" name="12">
                     <template #right-icon>
@@ -300,7 +327,10 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
@@ -308,7 +338,6 @@ export default {
                 { title: '身高', key: 'signHeight', unit: 'cm' },
                 { title: '体重', key: 'signWeight', unit: 'kg' },
                 { title: 'BMI', key: 'signBmi', unit: 'kg/m²' },
-                { title: '腰围', key: 'signWaistline', unit: 'cm' },
                 { title: '心率', key: 'signHeartRate', unit: '次/分' },
                 { title: '其他', key: 'signOther' }
             ],
@@ -323,6 +352,16 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            return this.visitInfo.inspectList || []
+        },
+        medicateCase() {
+            if (this.visitInfo.medicateCase) {
+                return JSON.parse(this.visitInfo.medicateCase)
+            } else {
+                return []
+            }
         }
     },
     methods: {
@@ -399,5 +438,6 @@ export default {
     padding: 8px;
     color: #4D5665;
     font-size: 13px;
+    border-radius: 4px;
 }
 </style>
\ No newline at end of file

src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue

@@ -173,6 +173,28 @@
                     <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">
+                            <div v-for="(y, yIndex) in x.items" :key="yIndex">
+                                <span>{{ y.itemName }}</span>
+                                <span v-if="y.itemName">：</span>
+                                <span>{{ y.itemValue }}</span>
+                                <span class="ml-1">{{ y.unit }}</span>
+                            </div>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="7" title="服药依从性" name="7">
                     <template #right-icon>
@@ -320,7 +342,10 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
@@ -338,12 +363,35 @@ export default {
                 { title: '随访单位', key: 'visitUnitName' },
                 { title: '随访科室', key: 'visitOfficeName' },
                 { title: '随访医生', key: 'visitDoctorName' }
+            ],
+            columnsAuxiliary: [
+                { title: '空腹静脉血糖值', key: 'emptyBloodGlucose', unit: 'mmol/L' },
+                { title: '空腹胰岛素', key: 'emptyInsulin', unit: 'mU/L' },
+                { title: '空腹C肽', key: 'emptyPeptide', unit: 'pmol/L' },
+                { title: '餐后2小时胰岛素', key: 'afterInsulin', unit: 'mU/L' },
+                { title: '餐后2小时C肽', key: 'afterPeptide', unit: 'pmol/L' }
             ]
         }
     },
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            let { auxiliaryExamination, inspectList = [] } = this.visitInfo
+            let auxiliaryExaminationList = auxiliaryExamination.split(',').map(e => +e) || []
+            let list = []
+            auxiliaryExaminationList.forEach(item => {
+                const items = inspectList.filter(e => e.insType === item)
+                if (items.length > 0) {
+                    list.push({
+                        insType: items[0].insType,
+                        insName: items[0].insName,
+                        items: [...items]
+                    })
+                }
+            })
+            return list
         }
     },
     methods: {

src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue

@@ -169,12 +169,23 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
+                        <div>检查名称：{{ x.itemName }}</div>
+                        <div>检查结果：{{ x.itemValue }}</div>
+                        <div>影像报告：</div>
+                        <ImagePreview :img-list="x.picturesList"></ImagePreview>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
+                <van-collapse-item key="7" title="服药依从性" name="7">
                     <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.medicationComplianceName }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -300,7 +311,10 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
@@ -323,6 +337,9 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            return this.visitInfo.inspectList || []
         }
     },
     methods: {

src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue

@@ -169,12 +169,87 @@
                     <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">
+                            <div v-for="(y, yIndex) in x.items" :key="yIndex">
+                                <template v-if="x.insType === 99">
+                                    <div>检查结果：{{ store.getDictValue('CP00157', y.itemValue) }}</div>
+                                    <div v-if="y.itemValue === '2'">异常情况：{{ y.abnormalSituation }}</div>
+                                    <div>影像报告：</div>
+                                    <ImagePreview :img-list="y.picturesList"></ImagePreview>
+                                </template>
+                                <template v-else>
+                                    <span>{{ y.itemName }}</span>
+                                    <span v-if="y.itemName">：</span>
+                                    <span>{{ y.itemValue }}</span>
+                                    <span class="ml-1">{{ y.unit }}</span>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-
+                    <div class="gray-box">
+                        <div>
+                            <span>您目前是否在服用降压药、降脂(如他汀类)或抗血小板(如阿司匹林)等心血管病相关药物：</span>
+                            <span>{{ visitInfo.medicationComplianceName }}</span>
+                        </div>
+                        <div>
+                            <span>药物名称：</span>
+                            <span>{{ currentMedicateCase.drugName }}</span>
+                            <span class="ml-4">剂量：</span>
+                            <span class="mr-1">{{ currentMedicateCase.dose }}</span>
+                            <span>{{ store.getDictValue('CP00081', currentMedicateCase.unit) }}</span>
+                        </div>
+                        <div>
+                            <span>用药频次：</span>
+                            <span>{{ store.getDictValue('CP00084', currentMedicateCase.frequency) }}</span>
+                            <span class="ml-4">用法：</span>
+                            <span>{{ store.getDictValue('CP00083', currentMedicateCase.usage) }}</span>
+                        </div>
+                        <div>
+                            <span>服药依从性：</span>
+                            <span>{{ store.getDictValue('CP00148', currentMedicateCase.compliance) }}</span>
+                        </div>
+                        <div>
+                            <span>不依从原因：</span>
+                            <span>{{ visitInfo.noComplianceReasonName }}</span>
+                        </div>
+                        <div v-if="(visitInfo.noComplianceReason || []).includes(3)">
+                            <span>副作用原因：</span>
+                            <span>{{ visitInfo.sideEffectReasonName }}</span>
+                        </div>
+                    </div>
+                    <div v-for="(item, index) in addMedicateCase" :key="index" class="gray-box mt-2">
+                        <div>
+                            <span>药物名称：</span>
+                            <span>{{ item.drugName }}</span>
+                            <span class="ml-4">剂量：</span>
+                            <span class="mr-1">{{ item.dose }}</span>
+                            <span>{{ store.getDictValue('CP00081', item.unit) }}</span>
+                        </div>
+                        <div>
+                            <span>用法：</span>
+                            <span>{{ store.getDictValue('CP00083', item.usage) }}</span>
+                            <span class="ml-4">频次：</span>
+                            <span>{{ store.getDictValue('CP00084', item.frequency) }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -213,10 +288,27 @@
                         </div>
                     </div>
                 </van-collapse-item>
+                <!-- {{ medicateCase }} -->
                 <van-collapse-item key="11" title="用药情况" name="11">
                     <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>
+                    <div v-if="visitInfo.adjustTreat === 1" 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>
                 </van-collapse-item>
                 <van-collapse-item key="12" title="转诊" name="12">
                     <template #right-icon>
@@ -277,6 +369,7 @@
 </template>
 <script>
 import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
+import { useStore } from '@/doctor/store'
 export default {
     components: { ImagePreview },
     props: {
@@ -287,6 +380,7 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             collapseAll: false,
             activeCollapse: [],
             columnsBase: [
@@ -300,7 +394,10 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
@@ -323,6 +420,43 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        medicateCase() {
+            if (this.visitInfo.medicateCase) {
+                return JSON.parse(this.visitInfo.medicateCase)
+            } else {
+                return []
+            }
+        },
+        currentMedicateCase() {
+            if (this.visitInfo.currentMedicateCase) {
+                return JSON.parse(this.visitInfo.currentMedicateCase)
+            } else {
+                return {}
+            }
+        },
+        addMedicateCase() {
+            if (this.visitInfo.addMedicateCase) {
+                return JSON.parse(this.visitInfo.addMedicateCase)
+            } else {
+                return []
+            }
+        },
+        inspectList() {
+            let { auxiliaryExamination, inspectList = [] } = this.visitInfo
+            let auxiliaryExaminationList = auxiliaryExamination.split(',').map(e => +e) || []
+            let list = []
+            auxiliaryExaminationList.forEach(item => {
+                const items = inspectList.filter(e => e.insType === item)
+                if (items.length > 0) {
+                    list.push({
+                        insType: items[0].insType,
+                        insName: items[0].insName,
+                        items: [...items]
+                    })
+                }
+            })
+            return list
         }
     },
     methods: {

src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue

@@ -169,12 +169,23 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
+                        <div>检查名称：{{ x.itemName }}</div>
+                        <div>检查结果：{{ x.itemValue }}</div>
+                        <div>影像报告：</div>
+                        <ImagePreview :img-list="x.picturesList"></ImagePreview>
+                    </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
+                <van-collapse-item key="7" title="服药依从性" name="7">
                     <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.medicationComplianceName }}</span>
+                        </div>
+                    </div>
                 </van-collapse-item>
                 <van-collapse-item key="8" title="药物不良反应" name="8">
                     <template #right-icon>
@@ -300,7 +311,10 @@ export default {
                 { title: '现住址', key: 'presentCodeName' },
                 { title: '详细地址', key: 'nowAddress' },
                 { title: '户籍地址', key: 'registeredCodeName' },
-                { title: '详细地址', key: 'permanentAddress' }
+                { title: '详细地址', key: 'permanentAddress' },
+                { title: '联系人姓名', key: 'contactName' },
+                { title: '联系人与居民关系', key: 'relationName' },
+                { title: '联系人电话', key: 'contactPhone' }
             ],
             columnsPhysical: [
                 { title: '收缩压SBP', key: 'signSystolicPressure', unit: 'mmHg' },
@@ -308,7 +322,6 @@ export default {
                 { title: '身高', key: 'signHeight', unit: 'cm' },
                 { title: '体重', key: 'signWeight', unit: 'kg' },
                 { title: 'BMI', key: 'signBmi', unit: 'kg/m²' },
-                { title: '腰围', key: 'signWaistline', unit: 'cm' },
                 { title: '心率', key: 'signHeartRate', unit: '次/分' },
                 { title: '其他', key: 'signOther' }
             ],
@@ -323,6 +336,9 @@ export default {
     computed: {
         residentInfo() {
             return this.visitInfo.residentsRecord || {}
+        },
+        inspectList() {
+            return this.visitInfo.inspectList || []
         }
     },
     methods: {

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

@@ -428,7 +428,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -673,7 +673,7 @@
         </van-popup>
 
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
 
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -745,9 +745,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>

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

@@ -360,7 +360,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -602,6 +602,7 @@
         <div class="label-title mt-2">辅助检查</div>
         <div class="bg-fa mt-2">
             <van-field
+                required
                 label="SpO2"
                 v-model="form.spo2"
                 placeholder="20~100，两位小数"
@@ -931,7 +932,7 @@
         </van-popup>
 
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
 
         <!-- 家庭氧疗 -->
         <div class="label-title mt-2">家庭氧疗</div>
@@ -988,7 +989,7 @@
             />
         </div>
         <!-- 无创呼吸机使用 -->
-        <div class="label-title mt-2" required>无创呼吸机使用</div>
+        <div class="label-title mt-2">无创呼吸机使用</div>
         <van-field
             label="每日"
             v-model="form.nippvEveryday"
@@ -1100,9 +1101,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>
@@ -1442,6 +1445,20 @@ export default {
                 doctorAdvice: [
                     { required: true, message: '请选择' }
                 ],
+                spo2: [
+                    { required: true, message: '请输入' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+(\.\d{1,2})?$/
+                            if (value && !(regex.test(value) && Number(value) >= 20 && Number(value) <= 100)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入20到100之间的数字，允许两位小数`
+                    }
+                ],
                 vaccinesHistory: [
                     { required: true, message: '请选择' }
                 ],

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

@@ -431,7 +431,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -677,7 +677,7 @@
         </van-popup>
 
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
         
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -749,9 +749,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>

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

@@ -461,7 +461,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -791,7 +791,7 @@
         </van-popup>
 
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
         <!-- 胰岛素 -->
         <div class="label-title mt-2">胰岛素</div>
         <van-field
@@ -855,42 +855,6 @@
                 class="card-input mt-2"
             />
         </div>
-        <!-- <div class="bg-fa mt-2">
-            <div class="label-title" style="font-size: 14px; color: #262626">用量</div>
-            <van-field style="padding: 0">
-                <template #input>
-                    <van-checkbox-group
-                        v-model="form.insulinDosage"
-                        shape="square"
-                        direction="horizontal"
-                        class="doc-checkbox-group"
-                    >
-                        <van-checkbox
-                            v-for="item in insulinDosage"
-                            :key="item.value"
-                            :name="item.checked"
-                            label-position="left"
-                            style="width: 48%"
-                        >
-                            {{ item.name }}
-                        </van-checkbox>
-                    </van-checkbox-group>
-                </template>
-            </van-field>
-            <template v-for="item in insulinDosage">
-                <van-field
-                    v-if="item.checked"
-                    :label="item.name"
-                    v-model="item.dosage"
-                    placeholder="请输入"
-                    class="card-input mt-2"
-                >
-                    <template #extra>
-                        <span>IU</span>
-                    </template>
-                </van-field>
-            </template>
-        </div> -->
 
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -962,9 +926,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>
@@ -1515,13 +1481,24 @@ export default {
 
         submit() {
             return new Promise((resolve, reject) => {
-                this.$refs.form.validate().then(() => {
+                this.$refs.form.validate().then(async() => {
+                    // 辅助检查
+                    const inspectList = await this.$refs.inspectRef.submit()
+                    // 治疗方案
+                    const medicateCase = await this.$refs.treatmentPlan.submit()
+
                     const form = fetchDataHandle(this.form, {
                         symptom: 'arrToStr',
                         currentDiagnosis: 'arrToStr',
                         auxiliaryExamination: 'arrToStr'
                     })
-                    resolve(form)
+                    resolve({
+                        ...form,
+                        // 辅助检查
+                        inspectList: inspectList,
+                        // 治疗方案
+                        medicateCase: JSON.stringify(medicateCase)
+                    })
                 }).catch(e => {
 
                 })

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

@@ -431,7 +431,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -676,7 +676,7 @@
         </van-popup>
 
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
 
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -748,9 +748,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>

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

@@ -474,7 +474,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -700,7 +700,7 @@
         </van-popup>
 
         <!-- 药物治疗 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
 
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -772,9 +772,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>

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

@@ -431,7 +431,7 @@
         <div v-if="form.regularExercise === 1" class="bg-fa mt-2">
             <div class="flex items-center">
                 <div class="label-title" required style="color: #262626; font-size: 14px">运动强度</div>
-                <MovementTip class="ml-2 mb-2"/>
+                <MovementTip class="ml-2 mb-2" />
             </div>
             <van-field :rules="rules.exerciseStrength" style="padding: 0">
                 <template #input>
@@ -676,7 +676,7 @@
         </van-popup>
         
         <!-- 治疗方案 -->
-        <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
+        <TreatmentPlan ref="treatmentPlan" :form="form" :diseaseInfo="diseaseInfo"></TreatmentPlan>
 
         <!-- 转诊 -->
         <div class="label-title mt-2" required>转诊</div>
@@ -748,9 +748,11 @@
         <!-- 现场随访照片 -->
         <div class="label-title mt-2">现场随访照片</div>
         <DocImageUpload
+            description="支持上传图片或PDF文件，图片支持上传jpg、png、jpeg格式，最多支持上传6个文件，文件大小请勿超过10M。"
+            lengthMessage="抱歉，最多可上传6个文件。"
             :imageData="form.visitImageList" 
             @change="(ids, option) => form.visitImage = ids"
-            :maxLength="8"
+            :maxLength="6"
         />
         <!-- 下次随访日期 -->
         <div class="label-title mt-2" required>下次随访日期</div>

vue.config.js

@@ -30,12 +30,12 @@ module.exports = defineConfig({
                 }
             },
             '/chronic-admin': {
-                target: 'https://beta-tumour.zmnyjk.com',
-                // target: 'http://192.168.1.126:8900',
+                // target: 'https://beta-tumour.zmnyjk.com',
+                target: 'http://192.168.1.202:8900',
                 changOrigin: true,
                 pathRewrite: {
-                    // '^/chronic-admin': '/'
-                    '^/chronic-admin': '/chronic-admin'
+                    '^/chronic-admin': '/'
+                    // '^/chronic-admin': '/chronic-admin'
                 }
             },
             '/chronic-resident': {