ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'long-0507'

Browse Source
This commit is contained in:
long
2026-05-07 16:29:41 +08:00
parent 576ef8e033 b6e6394e51
commit 4e23c4bf79
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/src/views/patient/reception/index.vue
+7 -13
View File
@@ -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>
<TrackingMatrix
<div class="card-title">日常记录</div>
<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 TrackingNoteTimeline from '@/views/tcm/diagnosis/components/TrackingNoteTimeline.vue'
import DailyMatrix from '@/views/tcm/diagnosis/components/DailyMatrix.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
+8 -5
View File
@@ -22,11 +22,14 @@
/>
</div>
<div class="daily-matrix__toolbar-right">
<el-button :disabled="!canEditDailyRecord" type="primary" @click="openQuickAdd('blood')">+血糖</el-button>
<el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('diet')">+饮食</el-button>
<el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('exercise')">+运动</el-button>
<el-button :disabled="!canEditDailyRecord" @click="openQuickAdd('tracking')">+备注</el-button>
<div v-if="canEditDailyRecord" class="daily-matrix__toolbar-right">
<el-button type="primary" @click="openQuickAdd('blood')">+血糖</el-button>
<el-button @click="openQuickAdd('diet')">+饮食</el-button>
<el-button @click="openQuickAdd('exercise')">+运动</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
+7 -11
View File
@@ -39,12 +39,15 @@
<PatientInfoCard :apt="apt" :diag="diag" />
<PatientCaseCard :apt="apt" :diag="diag" />
<!-- 跟踪信息 -->
<!-- 日常记录（只读） -->
<div class="card tracking-card">
<div class="card-title">跟踪信息</div>
<TrackingMatrix
<div class="card-title">日常记录</div>
<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 TrackingNoteTimeline from './components/TrackingNoteTimeline.vue'
import DailyMatrix from './components/DailyMatrix.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)