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

Merge branch '20260518-long'

Browse Source
This commit is contained in:
long
2026-05-18 17:43:25 +08:00
parent c1143f4629 9df6330d41
commit 8090e0aab3
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/logic/tcm/DiagnosisLogic.php
+7 -6
View File
@@ -3728,12 +3728,13 @@ class DiagnosisLogic extends BaseLogic
// 5.1) 跟踪备注（只读展示，按 note_date DESC）
$trackingNotes = TrackingNoteLogic::getByDiagnosis($diagnosisId);
// 6) 未服务天数（与 T3 列同口径）
$maxBloodTs = BloodRecord::where('diagnosis_id', $diagnosisId)
->max('record_date');
$maxBloodTs = (int) $maxBloodTs;
$unservedDays = $maxBloodTs > 0 ? max(0, (int) floor((time() - $maxBloodTs) / 86400)) : null;
$lastBloodRecordAt = $maxBloodTs > 0 ? date('Y-m-d', $maxBloodTs) : null;
// 6) 未服务天数：血糖 / 饮食 / 运动任一记录最近一条 record_date 为锚点
$maxBloodTs = (int) BloodRecord::where('diagnosis_id', $diagnosisId)->max('record_date');
$maxDietTs = (int) DietRecord::where('diagnosis_id', $diagnosisId)->max('record_date');
$maxExerciseTs = (int) ExerciseRecord::where('diagnosis_id', $diagnosisId)->max('record_date');
$maxRecordTs = max($maxBloodTs, $maxDietTs, $maxExerciseTs);
$unservedDays = $maxRecordTs > 0 ? max(0, (int) floor((time() - $maxRecordTs) / 86400)) : null;
$lastBloodRecordAt = $maxRecordTs > 0 ? date('Y-m-d', $maxRecordTs) : null;
return [
'appointment' => $appointment,