Browse Source

细节调整

liudan 2 months ago
parent
commit
9cd4342941

BIN
dist.zip


+ 5 - 23
src/pages/staticPages/patientHistory/patientHistory.vue

@@ -18,9 +18,8 @@
                 <view class="info-base">
                     <view class="info-name-row">
                         <text class="info-name">{{ patient.patName }}</text>
-                        <text class="info-gender">{{ patient.gender }} · {{ patient.admAge }}</text>
-                        </view>
-                        <text class="info-sub">就诊类型:{{ patient.patType }} · 人员标识:{{ patient.personId }}</text>
+                        <text class="info-gender">{{ patient.gender }} · {{ patient.admAge }} · {{ patient.patExtNo }}</text>
+                    </view>
                 </view>
                 <view class="collapse-btn" @tap="toggleExpand">
                     <text class="collapse-text">{{ expanded ? '收起' : '展开' }}</text>
@@ -90,8 +89,8 @@
                             <text class="timeline-title">{{ node.desc }}</text>
                             <text class="timeline-time">{{ node.datetime }}</text>
                         </view>
-                        <view class="timeline-tags" v-if="node.oper">
-                            <text class="timeline-tag">{{ node.oper }}</text>
+                        <view class="timeline-tags" v-if="node.oper && node.oper !== '用户152'">
+                            <text class="timeline-tag">{{ node.oper}}</text>
                         </view>
                     </view>
                 </view>
@@ -294,24 +293,6 @@ export default {
     onLoad(options) {
         // 从接诊中心携带参数
         this.admID = options.admID || '';
-        this.patient = {
-            avatar: (options.name || '?').substring(0, 1),
-            patName: options.name || '患者',
-            gender: options.sex || '男',
-            admAge: options.age || '',
-            patType: options.patType || '门诊',
-            admLoc: options.dept || '',
-            admDoc: options.doctor || '',
-            firstAdm: options.visitType || '',
-            IDCardNo: options.idCard || '',
-            mobile: options.phone || '',
-            address: options.address || '',
-            regLoc: options.regDept || '',
-            personId: options.admID || ''
-        };
-        if (!this.patient.personId) {
-            this.patient.personId = this.admID;
-        }
         this.loadPatientHistory();
     },
     computed: {
@@ -455,6 +436,7 @@ export default {
 
                     // 用接口返回覆盖患者信息(字段按 12100048 实际返回映射)
                     that.patient = Object.assign({}, that.patient, {
+                        ...info,
                         patName: info.patName || that.patient.patName,
                         gender: info.gender || that.patient.gender,
                         admAge: info.admAge || that.patient.admAge,

+ 3 - 2
src/pages/staticPages/receptionCenter/receptionCenter.vue

@@ -82,8 +82,8 @@
 
                     <!-- 患者详情 -->
                     <view class="card-body">
-                        <text class="detail-line">就诊ID:{{ item.admID }} · {{ item.sex }} · {{ item.age }} · {{ item.dept }} · {{ item.doctor }}</text>
-                        <view class="detail-line">登记时间:{{ item.time }}</view>
+                        <text class="detail-line">{{ item.sex }} · {{ item.age }} · {{ item.patExtNo }} · {{ item.dept }} · {{ item.doctor }}</text>
+                        <view class="detail-line">挂号时间:{{ item.time }}</view>
                     </view>
 
                     <!-- 操作按钮区 -->
@@ -216,6 +216,7 @@ export default {
                     const mapped = list.map((item) => {
                         const statusCode = item.StatusCode || '';
                         return {
+                            ...item,
                             avatar: (item.Name || '').substring(0, 1) || '?',
                             name: item.Name || '',
                             sex: item.Gender || '',

+ 7 - 1
src/pages/staticPages/workbench/workbench.vue

@@ -64,7 +64,7 @@
                     <text class="sub-title-text">今日接诊记录</text>
                 </view>
                 <view class="patient-list">
-                    <view class="patient-item" v-for="(patient, index) in patientList" :key="index">
+                    <view class="patient-item" v-for="(patient, index) in patientList" :key="index"  @tap="goHistory(patient)">
                         <view class="avatar-circle">
                             <text class="avatar-text">{{ patient.avatar }}</text>
                         </view>
@@ -111,6 +111,11 @@ export default {
         this.loadWorkbenchData();
     },
     methods: {
+        goHistory(item) {
+            uni.navigateTo({
+                url: `/pages/staticPages/patientHistory/patientHistory?admID=${encodeURIComponent(item.admID)}`
+            });
+        },
         loadWorkbenchData() {
             const that = this;
             const data = { params: [{}] };
@@ -143,6 +148,7 @@ export default {
                             {
                                 avatar: info.todayLastPatName.substring(0, 1),
                                 name: info.todayLastPatName,
+                                admID: info.todayLastAdmID,
                                 statusText: '进行中',
                                 statusType: 'active'
                             }