Merge branch 'master' of https://gitee.com/v_cms/zyt

admin/src/views/patient/reception/index.vue

@@ -126,18 +126,15 @@
                         />
                     </div>
 
-                    <!-- 跟踪备注（只读时间轴；新增入口在「编辑诊单」内） -->
+                    <!-- 日常记录（只读，与只读病例页同口径） -->
-                    <!-- <div class="card tracking-note-card">
-                        <div class="card-title">跟踪备注</div>
-                        <TrackingNoteTimeline :notes="trackingNotes" readonly />
-                    </div> -->
-
-                    <!-- 跟踪信息（与只读病例页同口径，自治 lazy load） -->
                     <div class="card metric-card">
-                        <div class="card-title">跟踪信息</div>
+                        <div class="card-title">日常记录</div>
-                        <TrackingMatrix
+                        <DailyMatrix
                             :diagnosis-id="Number(diag?.id ?? 0)"
+                            :patient-id="Number(diag?.patient_id ?? 0)"
                             :age="diag?.age ?? null"
+                            :patient-name="diag?.patient_name || ''"
+                            :read-only="true"
                         />
                     </div>
                 </template>
@@ -196,8 +193,7 @@ import { receptionQueue, receptionDetail, notifyAssistant, addDoctorNote } from
 import NoteTimeline from './components/NoteTimeline.vue'
 import PatientInfoCard from '@/views/tcm/diagnosis/components/PatientInfoCard.vue'
 import PatientCaseCard from '@/views/tcm/diagnosis/components/PatientCaseCard.vue'
-import TrackingMatrix from '@/views/tcm/diagnosis/components/TrackingMatrix.vue'
+import DailyMatrix from '@/views/tcm/diagnosis/components/DailyMatrix.vue'
-import TrackingNoteTimeline from '@/views/tcm/diagnosis/components/TrackingNoteTimeline.vue'
 import { completeAppointment } from '@/api/doctor'
 import { getCallSignature } from '@/api/tcm'
 import feedback from '@/utils/feedback'
@@ -273,8 +269,6 @@ const noteSaving = ref(false)
 const apt = computed<any>(() => detail.value?.appointment || {})
 const diag = computed<any>(() => detail.value?.diagnosis || {})
 const doctorNotes = computed<any[]>(() => detail.value?.doctor_notes || [])
-const trackingNotes = computed<any[]>(() => detail.value?.tracking_notes || [])
-
 const todayMeta = computed(() => {
     const d = new Date()
     const week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'][d.getDay()]

admin/src/views/tcm/diagnosis/components/DailyMatrix.vue

@@ -22,11 +22,14 @@
                 />
             </div>
 
-            <div class="daily-matrix__toolbar-right">
+            <div v-if="canEditDailyRecord" class="daily-matrix__toolbar-right">
-                <el-button :disabled="!canEditDailyRecord" type="primary" @click="openQuickAdd('blood')">+血糖</el-button>
+                <el-button type="primary" @click="openQuickAdd('blood')">+血糖</el-button>
-                <el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('diet')">+饮食</el-button>
+                <el-button @click="openQuickAdd('diet')">+饮食</el-button>
-                <el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('exercise')">+运动</el-button>
+                <el-button @click="openQuickAdd('exercise')">+运动</el-button>
-                <el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('tracking')">+备注</el-button>
+                <el-button @click="openQuickAdd('tracking')">+备注</el-button>
+                <el-button @click="fetchTracking">刷新</el-button>
+            </div>
+            <div v-else class="daily-matrix__toolbar-right">
                 <el-button @click="fetchTracking">刷新</el-button>
             </div>
         </div>

admin/src/views/tcm/diagnosis/readonly.vue

@@ -39,12 +39,15 @@
             <PatientInfoCard :apt="apt" :diag="diag" />
             <PatientCaseCard :apt="apt" :diag="diag" />
 
-            <!-- 跟踪信息 -->
+            <!-- 日常记录（只读） -->
             <div class="card tracking-card">
-                <div class="card-title">跟踪信息</div>
+                <div class="card-title">日常记录</div>
-                <TrackingMatrix
+                <DailyMatrix
                     :diagnosis-id="Number(diagnosisIdNum)"
+                    :patient-id="Number(diag?.patient_id ?? 0)"
                     :age="diag?.age ?? null"
+                    :patient-name="diag?.patient_name || ''"
+                    :read-only="true"
                 />
             </div>
 
@@ -54,11 +57,6 @@
                 <NoteTimeline :notes="doctorNotes" :diagnosis-id="diag?.id" />
             </div>
 
-            <!-- 跟踪备注（只读时间轴） -->
-            <div class="card tracking-note-card">
-                <div class="card-title">跟踪备注</div>
-                <TrackingNoteTimeline :notes="trackingNotes" readonly />
-            </div>
         </template>
     </div>
 </template>
@@ -71,8 +69,7 @@ import { diagnosisReadonlyDetail } from '@/api/tcm'
 import { formatGender } from '@/utils/diag-display'
 import PatientInfoCard from './components/PatientInfoCard.vue'
 import PatientCaseCard from './components/PatientCaseCard.vue'
-import TrackingMatrix from './components/TrackingMatrix.vue'
+import DailyMatrix from './components/DailyMatrix.vue'
-import TrackingNoteTimeline from './components/TrackingNoteTimeline.vue'
 import NoteTimeline from '@/views/patient/reception/components/NoteTimeline.vue'
 
 const route = useRoute()
@@ -87,7 +84,6 @@ const detail = ref<any>(null)
 const apt = computed<any>(() => detail.value?.appointment || {})
 const diag = computed<any>(() => detail.value?.diagnosis || {})
 const doctorNotes = computed<any[]>(() => detail.value?.doctor_notes || [])
-const trackingNotes = computed<any[]>(() => detail.value?.tracking_notes || [])
 const unservedDays = computed<number | null>(() => {
     const v = detail.value?.unserved_days
     return v === null || v === undefined ? null : Number(v)