bug修改

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '2fb02c59-8f20-4157-b85e-789e84dea974'
+                    token = '4df45197-d2f8-42ba-9ab5-8b8100c53bcf'
                 }
             }
             if (token) {

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

@@ -87,7 +87,7 @@
                         class="form-input mt-2"
                     />
                 </div>
-                <div style="background-color: #fff; padding: 8px; border-radius: 8px" class="mt-2">
+                <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"

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

@@ -52,7 +52,7 @@
                 <div class="p-4" style="height: 100%">
                     <div class="flex justify-between items-center mb-4 pop-title">
                         <div class="greyColor" @click="item.showUnit = false">取消</div>
-                        <div>随访方式（单选）</div>
+                        <div>单位（单选）</div>
                         <div></div>
                     </div>
                     <div style="height: 80%; overflow: auto">
@@ -81,7 +81,7 @@
                 <div class="p-4" style="height: 100%">
                     <div class="flex justify-between items-center mb-4 pop-title">
                         <div class="greyColor" @click="item.showFrequency = false">取消</div>
-                        <div>随访方式（单选）</div>
+                        <div>频次（单选）</div>
                         <div></div>
                     </div>
                     <div style="height: 80%; overflow: auto">
@@ -110,7 +110,7 @@
                 <div class="p-4" style="height: 100%">
                     <div class="flex justify-between items-center mb-4 pop-title">
                         <div class="greyColor" @click="item.showUsage = false">取消</div>
-                        <div>随访方式（单选）</div>
+                        <div>用法（单选）</div>
                         <div></div>
                     </div>
                     <div style="height: 80%; overflow: auto">

src/doctor/followUp/separateFU/form/Index.vue

@@ -21,10 +21,12 @@
 <script>
 import BaseInfo from './BaseInfo.vue'
 import FormCont from './FormCont.vue'
+import { useStore } from '@/doctor/store'
 export default {
     components: { BaseInfo, FormCont },
     data() {
         return {
+            store: useStore(),
             step: 1,
             baseInfo: {},
             diseaseInfo: {}
@@ -56,6 +58,7 @@ export default {
             this.$refs.formCont.submit().then(() => {
                 this.$message.success('新增成功')
                 this.$router.go(-1)
+                this.store.onRefreshMark()
             })
         }
     }

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

@@ -599,13 +599,13 @@
         </van-field>
 
         <!-- 辅助检查 -->
-        <div class="label-title mt-2" required>辅助检查</div>
+        <div class="label-title mt-2">辅助检查</div>
         <div class="bg-fa mt-2">
-            <div class="label-title" style="color: #262626; font-size: 14px">空腹静脉血糖值</div>
+            <div class="label-title" required style="color: #262626; font-size: 14px">空腹静脉血糖值</div>
             <van-field
                 v-model="form.emptyBloodGlucose"
                 placeholder="0~50，2位小数"
-                :rules="rules.emptyBloodGlucose"
+                :rules="[{ required: true, message: '请输入' }]"
                 class="card-input"
             >
                 <template #extra>
@@ -790,13 +790,12 @@
         <!-- 治疗方案 -->
         <TreatmentPlan ref="treatmentPlan" :form="form"></TreatmentPlan>
         <!-- 胰岛素 -->
-        <div class="label-title mt-2" required>胰岛素</div>
+        <div class="label-title mt-2">胰岛素</div>
         <van-field
             v-model="form.insulinTypeName"
             isLink
             readonly
             placeholder="请选择"
-            :rules="rules.insulinTypeName"
             @click="showInsulinType = true"
             class="form-input"
         />

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

@@ -611,30 +611,7 @@
         <Inspect ref="inspectRef" :form="form" :diseaseInfo="diseaseInfo"></Inspect>
 
         <!-- 目前高血压用药及依从性 -->
-        <div class="label-title mt-2" required>目前高血压用药及依从性</div>
-        <div class="bg-fa">
-            <div class="label-title" required style="color: #262626; font-size: 14px; line-height: 24px">您目前是否在服用降压药、降脂(如他汀类)或抗血小板(如阿司匹林)等心血管病相关药物</div>
-            <van-field :rules="rules.medicationCompliance" style="padding: 0">
-                <template #input>
-                    <van-radio-group
-                        v-model="form.medicationCompliance"
-                        shape="dot"
-                        direction="horizontal"
-                        class="doc-radio-group-now"
-                    >
-                        <van-radio
-                            v-for="item in store.getDict('DC00001')"
-                            :key="item.value"
-                            :name="item.value"
-                            label-position="left"
-                            style="width: 48%"
-                        >
-                            {{ item.name }}
-                        </van-radio>
-                    </van-radio-group>
-                </template>
-            </van-field>
-        </div>
+        <HypertensionDrugs ref="hypertensionDrugsRef" :form="form"></HypertensionDrugs>
         
         <!-- 药物不良反应 -->
         <div class="label-title mt-2" required>药物不良反应</div>
@@ -903,8 +880,10 @@ import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor
 import Inspect from '../../components/Inspect.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
+
+import HypertensionDrugs from '../../components/HypertensionDrugs.vue'
 export default {
-    components: { CheckBtn, BloodPressurePanel, BloodPressureBt, DocImageUpload, DocUnit, DocOffice, DocOfficeDoctor, Inspect, TreatmentPlan },
+    components: { CheckBtn, BloodPressurePanel, BloodPressureBt, DocImageUpload, DocUnit, DocOffice, DocOfficeDoctor, Inspect, TreatmentPlan, HypertensionDrugs },
     inject: ['pressureObj'],
     props: {
         diseaseInfo: {
@@ -1339,16 +1318,27 @@ export default {
                 this.$refs.form.validate().then(async () => {
                     // 辅助检查
                     const inspectList = await this.$refs.inspectRef.submit()
+                    // 目前高血压用药及依从性
+                    const { currentMedicateCase, addMedicateCase } = await this.$refs.hypertensionDrugsRef.submit()
+                    // 治疗方案
+                    const medicateCase = await this.$refs.treatmentPlan.submit()
 
                     const form = fetchDataHandle(this.form, {
                         symptom: 'arrToStr',
+                        noComplianceReason: 'arrToStr',
                         currentDiagnosis: 'arrToStr',
                         auxiliaryExamination: 'arrToStr'
                     })
                     
                     resolve({
                         ...form,
-                        inspectList: inspectList
+                        // 辅助检查
+                        inspectList: inspectList,
+                        // 目前高血压用药及依从性
+                        currentMedicateCase: JSON.stringify(currentMedicateCase),
+                        addMedicateCase: JSON.stringify(addMedicateCase),
+                        // 治疗方案
+                        medicateCase: JSON.stringify(medicateCase)
                     })
                 }).catch(e => {
 
@@ -1387,7 +1377,7 @@ export default {
                 // this.insulinDosage = this.store.getDict('CP00123')
                 // console.log(this.insulinDosage)
             }
-        }
+        },
     },
     watch: {
         'form.signHeight': {