查询页面接口修改；初筛复筛详情接口修改

src/api/doctor/resident.js

@@ -15,6 +15,10 @@ export function getResidentByPage(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/page`, body: params, loading: true })
 }
 
+export function getResidentByIdCard(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/check-info`, body: params, loading: true })
+}
+
 //转诊列表查询
 export function getReferralList(params, loading) {
     return fetchBase({ url: `/chronic-admin/v1/base-info/referral-list`, body: params, loading })

src/api/doctor/screening.js

@@ -7,7 +7,7 @@ export function getScreenAllList(residentInfoId, loading) {
 
 // 慢病专病筛查详情
 export function secondScreenDetail(params) {
-    return fetchBase({ url: `/chronic-resident/v1/chronic-screening-record/rescreen-detail`, body: params, loading: true })
+    return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/rescreen-detail`, body: params, loading: true })
 }
 
 //查询最近一次专病高危筛查
@@ -24,6 +24,10 @@ export function saveSecondScreening(params) {
 export function updateSecondScreening(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/update`,body: params,loading: true})
 }
+// 删除复筛
+export function deleteSecondScreening(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/delete`,body: params,loading: true})
+}
 
 // 保存初筛
 export function saveFirstScreening(params) {
@@ -42,5 +46,5 @@ export function deleteFirstScreening(params) {
 
 // 慢病高危筛查详情
 export function firstScreenDetail(params) {
-    return fetchBase({ url: `/chronic-resident/v1/chronic-screening-record/screening-detail`, body: params, loading: true })
+    return fetchBase({ url: `/chronic-admin/v1/chronic-screening-record/screening-detail`, body: params, loading: true })
 }

src/doctor/components/bloodPressure/BloodPressure.vue

@@ -94,7 +94,7 @@ export default {
         },
         loadDevice() {
             // 372 || 
-            getPressureDevices(this.authInfo.unitId).then(res => {
+            getPressureDevices(372 || this.authInfo.unitId).then(res => {
                 console.log('getPressureDevices', res)
                 this.deviceList = res.data || []
                 if (!this.deviceList.length) {
@@ -118,7 +118,7 @@ export default {
             }
             this.loopMark++
             // '06B32312010330' || 
-            getPressureData(this.deviceNo).then(res => {
+            getPressureData('06B32312010330' || this.deviceNo).then(res => {
                 const result = res.data || []
                 if (result.length) {
                     let val = result[result.length - 1]

src/doctor/patientDetail/components/disease/List.vue

@@ -63,7 +63,7 @@
                         <span class="label">治疗方式</span>
                         <span>{{ item.therapyMethodName || '-' }}</span>
                     </div>
-                    <div>
+                    <div class="text-ellipsis">
                         <span class="label">创建单位</span>
                         <span>{{ item.createUnitName }}</span>
                     </div>
@@ -100,11 +100,11 @@
                         <span class="label">预计随访地点</span>
                         <span>{{ item.visitPlace || '-' }}</span>
                     </div>
-                    <div>
+                    <div class="text-ellipsis">
                         <span class="label">创建单位</span>
                         <span>{{ item.createUnitName }}</span>
                     </div>
-                    <div>
+                    <div class="text-ellipsis">
                         <span class="label">创建科室</span>
                         <span>{{ item.createOfficeName }}</span>
                     </div>

src/doctor/patientDetail/components/screening/Record.vue

@@ -61,15 +61,15 @@
                             <span class="label">筛查日期</span>
                             <span>{{ item.screenDate }}</span>
                         </div>
-                        <div>
+                        <div class="text-ellipsis">
                             <span class="label">筛查单位</span>
                             <span>{{ item.screenUnitName }}</span>
                         </div>
-                        <div>
+                        <div class="text-ellipsis">
                             <span class="label">筛查科室</span>
                             <span>{{ item.screenOfficeName }}</span>
                         </div>
-                        <div>
+                        <div class="text-ellipsis">
                             <span class="label">筛查医生</span>
                             <span>{{ item.screenDoctorName }}</span>
                         </div>
@@ -102,7 +102,7 @@
 
 <script>
 import { useStore } from '@/doctor/store'
-import { getScreenAllList, deleteFirstScreening } from '@/api/doctor/screening.js'
+import { getScreenAllList, deleteFirstScreening, deleteSecondScreening } from '@/api/doctor/screening.js'
 import { showConfirmDialog } from 'vant'
 
 export default {
@@ -201,7 +201,16 @@ export default {
             })
         },
         delSecondBtn(record) {
-
+            showConfirmDialog({
+                message: '确定要删除吗？'
+            }).then(() => {
+                deleteSecondScreening({ id: record.id }).then(res => {
+                    setTimeout(() => {
+                        this.$message.info('删除成功')
+                    }, 600)
+                    this.secondScreenList = this.secondScreenList.filter(e => e.id !== record.id)
+                })
+            }).catch((err) => { console.warn('delFirstBtn', err) })
         }
     },
     watch: {

src/doctor/search/Search.vue

@@ -40,17 +40,17 @@
 
             <div class="pt-2" v-if="state === 2">
                 <div class="text-12" style="color: #8c8c8c">查找结果：</div>
-                <div class="card" v-if="result.id">
+                <div class="card" v-if="result.checkCode == 2">
                     <!-- v-if="result.chronicTagsArrayName || result.firstScreenResult || result.highTagsArray" -->
                     <div class="py-3">
                         <span class="text-16 font-semibold mr-3">{{ result.residentName }}</span>
                         <span class="text-12 mr-3">{{ result.currentAge || '-' }} 岁</span>
                         <span class="text-12 mr-3">{{ result.genderName }}</span>
-                        <span class="text-12" v-if="result.chronicStatus == 9">死亡</span>
+                        <span class="text-12" v-if="result.deathStatus == 9">死亡</span>
                     </div>
                     <div class="mb-2">
                         <span class="label">身份证号</span>
-                        <span>{{ $idCardHide(result.idCard) }}</span>
+                        <span>{{ $idCardHide(idCard) }}</span>
                     </div>
                     <div class="mb-2">
                         <span class="label">人群分类</span>
@@ -63,7 +63,7 @@
                     <div class="flex mb-2">
                         <span class="shrink-0 label">人群标签</span>
                         <!-- <chronic-tag :list="result.chronicTagsArray" /> -->
-                        <span class="grow text-wrap">{{ result.groupsArraysName }}</span>
+                        <span class="grow text-wrap">{{ result.chronicTagsList ? result.chronicTagsList.join('，') : '-' }}</span>
                     </div>
                     <div class="text-12 tip">
                         <div style="color: #A5AEBE;" >提示：</div>
@@ -91,7 +91,7 @@
                     </div>
                 </div> -->
 
-                <div class="text-center empty" v-if="!total">
+                <div class="text-center empty" v-if="result.checkCode != 2">
                     <img src="@/assets/image/doctor/empty.png" alt="" style="width: 1.2rem;">
                     <p>暂无数据</p>
                 </div>
@@ -101,9 +101,9 @@
 </template>
 
 <script>
-import { getResidentByPage } from '@/api/doctor/resident.js'
+import { getResidentByIdCard } from '@/api/doctor/resident.js'
 import { validateIdCard } from '@/utils/commonReg.js'
-import { setLocalStorage, getLocalStorage } from '@/utils/common.js'
+import { setLocalStorage, getLocalStorage, getInfoByIdCard } from '@/utils/common.js'
 import { showFailToast } from 'vant'
 // import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
 import IdCardScan from '@/doctor/components/idCardScan/IdCardScan.vue'
@@ -121,7 +121,6 @@ export default {
             result: {},
             // 显示切换
             state: 1,
-            total: 0,
             show: false,
             value1: undefined,
             value2: undefined
@@ -150,10 +149,12 @@ export default {
                 pageIndex: 1,
                 pageSize: 10
             }
-            getResidentByPage(query).then(res => {
-                const result = res?.data?.dataList || []
-                this.result = result[0] || {}
-                this.total = res.data.total || 0
+            getResidentByIdCard(query).then(res => {
+                const result = res.data || {}
+                const info = getInfoByIdCard(this.idCard)
+                result.currentAge = info.age
+                result.genderName = info.gender == 1 ? '男' : '女'
+                this.result = result
                 this.setHistory()
             }).finally(() => {
                 this.state = 2

src/doctor/workbench/Workbench.vue

@@ -70,7 +70,7 @@ export default {
                 { key: 'receive', component: 'TableReceive', name: '待接诊居民' },
                 // { key: 'screenRecord', component: 'TableScreenRecord', name: '当年待筛查记录' }, 
                 { key: 'firstScreen', component: 'TableFirstScreen', name: '初筛高危待筛查' },
-                { key: 'highRisk', component: 'TableHighRisk', name: '高危待诊断' }
+                { key: 'highRisk', component: 'TableHighRisk', name: '慢病高危待诊断' }
             ],
             tabActive:{},
             configName: '慢病APP个性化配置',