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

src/api/residentWX/visit.js

@@ -11,7 +11,7 @@ export function queryMajorFUDetail(params) {
 
 //查询专病高危随访详情
 export function querySpecificFUDetail(params) {
-    return fetchBase({ url: `/chronic-resident/v1/chronic-visit-record/high-major-detail`, body: params, loading: true })
+    return fetchBase({ url: `/chronic-resident/v1/chronic-visit-record/high-specific-detail`, body: params, loading: true })
 }
 
 // 查询通用随访详情

src/residentWX/screening/detail/SecondDetail.vue

@@ -383,7 +383,7 @@
                                         <span>{{ info.giveSmokingAge || '-'}} 岁</span>
                                     </span>
                             </div>
-                            <div class='flex justify-between py-1 border-bottom item' v-if="smokeShow && record?.diseaseArrays?.includes(1)">
+                            <div class='flex justify-between py-1 border-bottom item' v-if="smokeShow && info?.diseaseArrays?.includes(1)">
                                 <span class='shrink-0 mr-2 label'>经常吸入二手烟</span>
                                 <span class='text-end'>
                                         <span>{{ info.secondSmokingName || '-'}} </span>

src/residentWX/visit/detail/FirstFUDetail.vue

@@ -13,9 +13,9 @@
                         <span class="name">{{ userInfo.residentName }}</span>
                     </div>
                     <div class='lh-22'>
-                        <div class='mt-3'>随访日期：<span class='color-26'>{{ info.screenDate || '-' }}</span></div>
+                        <div class='mt-3'>随访日期：<span class='color-26'>{{ info.visitDate || '-' }}</span></div>
                         <span>慢病高危评估结果：</span>
-                        <span :class="{'text-red': info.screenResult !== 1, 'color-26': info.screenResult === 1 }">{{ info.screenResultName }}</span>
+                        <span :class="{'text-red': info.visitResult !== 1, 'color-26': info.visitResult === 1 }">{{ info.visitResultName }}</span>
                     </div>
                 </div>
             </div>
@@ -96,7 +96,6 @@
 
 <script>
 import { showNotify } from 'vant'
-import { firstScreenDetail } from '@/api/residentWX/screening.js'
 import { useStore } from '@/residentWX/store'
 import { queryMajorFUDetail } from '@/api/residentWX/visit'
 
@@ -135,7 +134,7 @@ export default {
                     { title: '血清总胆固醇', key: 'serumCholesterin', unit: 'mmol/L' },
                     { title: '高密度脂蛋白胆固醇', key: 'hdlCholesterin', unit: 'mmol/L' },
                     { title: '运动', key: 'exerciseIntensityName' },
-                    { title: '慢病高危评估结果', key: 'screenResultName'  }
+                    { title: '慢病高危评估结果', key: 'visitResultName'  }
                 ], info: {} },
                     { title: '随访机构', name: '3', columns: [
                     { title: '随访机构', key: 'visitUnitName' },

src/residentWX/visit/detail/SecondFUDetail.vue

@@ -14,7 +14,7 @@
 
                     </div>
                     <div class='top-label mt-3'>
-                        <span >报告日期：<span class='color-b'>{{ info.screenDate || '-' }}</span></span>
+                        <span >报告日期：<span class='color-b'>{{ info.visitDate || '-' }}</span></span>
                     </div>
                     <div class='top-label'>
                         <span>慢病高危评估结果：</span>
@@ -383,7 +383,7 @@
                                         <span>{{ info.giveSmokingAge || '-'}} 岁</span>
                                     </span>
                             </div>
-                            <div class='flex justify-between py-1 border-bottom item' v-if="smokeShow && record?.diseaseArrays?.includes(1)">
+                            <div class='flex justify-between py-1 border-bottom item' v-if="smokeShow && info?.diseaseArrays?.includes(1)">
                                 <span class='shrink-0 mr-2 label'>经常吸入二手烟</span>
                                 <span class='text-end'>
                                         <span>{{ info.secondSmokingName || '-'}} </span>
@@ -488,7 +488,6 @@
 
 <script>
 import { showNotify } from 'vant'
-import { secondScreenDetail } from '@/api/residentWX/screening.js'
 import { useStore } from '@/residentWX/store'
 import { fetchDataHandle } from '@/utils/common'
 import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'

vue.config.js

@@ -39,12 +39,12 @@ module.exports = defineConfig({
                 }
             },
             '/chronic-resident': {
-                target: 'http://192.168.1.142:8903',
-                // target: 'https://beta-tumour.zmnyjk.com',
+                // target: 'http://192.168.1.142:8903',
+                target: 'https://beta-tumour.zmnyjk.com',
                 changOrigin: true,
                 pathRewrite: {
-                    '^/chronic-resident': '/',
-                    // '^/chronic-resident': '/chronic-resident'
+                    // '^/chronic-resident': '/',
+                    '^/chronic-resident': '/chronic-resident'
                 }
             }
         },