专病随访bug修改

src/doctor/Doctor.vue

@@ -66,8 +66,8 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    // token = '9486b3ed-332d-4a2e-86dc-0502a3e2bd69'
-                    token = '25637a72-13ba-4efb-a892-e443a93113ef'
+                    // token = '54fa5c76-c54a-4b19-b4c8-207b0e779340'
+                    token = 'c4cedb28-0a7c-498a-b736-f88a244cc157'
                 }
             }
             if (token) {

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

@@ -169,12 +169,24 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
+                    <div v-for="item in columnsAssistant" :key="item.key" class="list">
+                        <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>
+                    <template v-if="inspectList?.length > 0">
+                        <div class="py-1">其他检查</div>
                         <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>
+                    </template>
                 </van-collapse-item>
                 <van-collapse-item key="7" title="服药依从性" name="7">
                     <template #right-icon>
@@ -332,6 +344,22 @@ export default {
                 { title: '随访单位', key: 'visitUnitName' },
                 { title: '随访科室', key: 'visitOfficeName' },
                 { title: '随访医生', key: 'visitDoctorName' }
+            ],
+            columnsAssistant: [
+                { title: 'SpO₂', key: 'spo2', unit: '%' },
+                { title: 'FEV1', key: 'fev1', unit: 'L' },
+                { title: 'FVC', key: 'fvc', unit: 'L' },
+                { title: 'FEV1/FVC', key: 'fev1Fvc', unit: '%' },
+                { title: 'FEV1%pred', key: 'fev1Pred', unit: '%' },
+                { title: 'FVC%pred', key: 'fvcPred', unit: '%' },
+                { title: '白细胞计数', key: 'wbcCount', unit: 'x10⁹/L' },
+                { title: '中性粒细胞计数', key: 'nesCount', unit: 'x10⁹/L' },
+                { title: '嗜酸性粒细胞计数', key: 'eosCount', unit: 'x10⁹/L' },
+                { title: '嗜碱性粒细胞计数', key: 'bosCount', unit: 'x10⁹/L' },
+                { title: '单核细胞计数', key: 'moCount', unit: 'x10⁹/L' },
+                { title: '淋巴细胞计数', key: 'lymphCount', unit: 'x10⁹/L' },
+                { title: '血红蛋白', key: 'hgbCount', unit: 'g/L' },
+                { title: '血小板计数', key: 'pltCount', unit: 'x10⁹/L' },
             ]
         }
     },

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

@@ -38,7 +38,10 @@
                         <div class="flex justify-between py-1 border-bottom item">
                             <span class="shrink-0 mr-2 label">随访方式</span>
                             <span class="text-end">
-                                {{ visitInfo.visitWayName || '-' }}
+                                <span>{{ visitInfo.visitWayName }}</span>
+                                <span v-if="visitInfo.visitWay === 1 || visitInfo.visitWay === 4">
+                                    ({{ visitInfo.interviewMethodName }})
+                                </span>
                             </span>
                         </div>
                     </div>

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

@@ -608,7 +608,7 @@
             <van-field
                 v-model="form.emptyBloodGlucose"
                 placeholder="0~50，2位小数"
-                :rules="[{ required: true, message: '请输入' }]"
+                :rules="rules.emptyBloodGlucose"
                 class="card-input"
             >
                 <template #extra>
@@ -1343,6 +1343,72 @@ export default {
                 doctorAdvice: [
                     { required: true, message: '请选择' }
                 ],
+                emptyBloodGlucose: [
+                    { required: true, message: '请输入' },
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+(\.\d{1,2})?$/
+                            if (value && !(regex.test(value) && Number(value) >= 0 && Number(value) <= 50)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入0到50之间的数字，允许两位小数`
+                    }
+                ],
+                emptyInsulin: [
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 0 && Number(value) <= 10000)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入0到10000之间的整数`
+                    }
+                ],
+                emptyPeptide: [
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 0 && Number(value) <= 10000)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入0到10000之间的整数`
+                    }
+                ],
+                afterInsulin: [
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 0 && Number(value) <= 10000)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入0到10000之间的整数`
+                    }
+                ],
+                afterPeptide: [
+                    {
+                        validator: (value, rule) => {
+                            let res = true
+                            const regex = /^\d+$/
+                            if (value && !(regex.test(value) && Number(value) >= 0 && Number(value) <= 10000)) {
+                                res = false
+                            }
+                            return res
+                        },
+                        message: `请输入0到10000之间的整数`
+                    }
+                ],
                 medicationCompliance: [
                     { required: true, message: '请选择' }
                 ],