From 9df6330d41aa936cede4a2da8206f6d7eb45eb63 Mon Sep 17 00:00:00 2001
From: long <452591453@qq.com>
Date: Mon, 18 May 2026 17:42:24 +0800
Subject: [PATCH] update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改未服务天数判断条件
---
 admin/src/views/tcm/diagnosis/index.vue       |  2 +-
 admin/src/views/tcm/diagnosis/readonly.vue    |  4 +--
 .../app/adminapi/lists/tcm/DiagnosisLists.php | 27 +++++++++++++++----
 .../app/adminapi/logic/tcm/DiagnosisLogic.php | 13 ++++-----
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/admin/src/views/tcm/diagnosis/index.vue b/admin/src/views/tcm/diagnosis/index.vue
index a2d26249..d771f723 100644
--- a/admin/src/views/tcm/diagnosis/index.vue
+++ b/admin/src/views/tcm/diagnosis/index.vue
@@ -257,7 +257,7 @@
                     <template #default="{ row }">
                         <el-tooltip
                             v-if="row.last_blood_record_at"
-                            :content="`最近一次血糖打卡：${row.last_blood_record_at}`"
+                            :content="`最近一次健康打卡：${row.last_blood_record_at}`"
                             placement="top"
                         >
                             <span class="unserved-days" :class="unservedDaysClass(row.unserved_days)">
diff --git a/admin/src/views/tcm/diagnosis/readonly.vue b/admin/src/views/tcm/diagnosis/readonly.vue
index 3b5b16e6..fb134406 100644
--- a/admin/src/views/tcm/diagnosis/readonly.vue
+++ b/admin/src/views/tcm/diagnosis/readonly.vue
@@ -17,14 +17,14 @@
                 </span>
                 <el-tooltip
                     v-if="lastBloodAt"
-                    :content="`最近一次血糖打卡：${lastBloodAt}`"
+                    :content="`最近一次健康打卡：${lastBloodAt}`"
                     placement="bottom"
                 >
                     <span :class="['unserved-badge', unservedDaysClass(unservedDays)]">
                         未服务 {{ unservedDays ?? '—' }} 天
                     </span>
                 </el-tooltip>
-                <span v-else class="unserved-badge unserved-muted">从未打卡血糖</span>
+                <span v-else class="unserved-badge unserved-muted">从未打卡</span>
             </div>
         </div>
 
diff --git a/server/app/adminapi/lists/tcm/DiagnosisLists.php b/server/app/adminapi/lists/tcm/DiagnosisLists.php
index 79c8a78a..f9ee093c 100644
--- a/server/app/adminapi/lists/tcm/DiagnosisLists.php
+++ b/server/app/adminapi/lists/tcm/DiagnosisLists.php
@@ -18,6 +18,8 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\adminapi\logic\dept\DeptLogic;
 use app\common\model\tcm\Diagnosis;
 use app\common\model\tcm\BloodRecord;
+use app\common\model\tcm\DietRecord;
+use app\common\model\tcm\ExerciseRecord;
 use app\common\model\DiagnosisViewRecord;
 use app\common\model\Order;
 use app\common\model\doctor\Appointment;
@@ -387,19 +389,34 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         }
         unset($item);
 
-        // 未服务天数：以血糖记录最近一条 record_date 为锚点（口径见 prd T3）
-        // 单次 GROUP BY 聚合，不会成 N+1；走 idx_diagnosis_id 索引。
+        // 未服务天数：血糖 / 饮食 / 运动任一记录最近一条 record_date 为锚点
         $diagIdsForUnserved = array_values(array_filter(array_unique(array_column($lists, 'id'))));
-        $maxBloodByDiag = [];
+        $maxRecordByDiag = [];
         if (!empty($diagIdsForUnserved)) {
-            $maxBloodByDiag = BloodRecord::whereIn('diagnosis_id', $diagIdsForUnserved)
+            $maxBlood = BloodRecord::whereIn('diagnosis_id', $diagIdsForUnserved)
                 ->whereNull('delete_time')
                 ->group('diagnosis_id')
                 ->column('MAX(record_date)', 'diagnosis_id');
+            $maxDiet = DietRecord::whereIn('diagnosis_id', $diagIdsForUnserved)
+                ->whereNull('delete_time')
+                ->group('diagnosis_id')
+                ->column('MAX(record_date)', 'diagnosis_id');
+            $maxExercise = ExerciseRecord::whereIn('diagnosis_id', $diagIdsForUnserved)
+                ->whereNull('delete_time')
+                ->group('diagnosis_id')
+                ->column('MAX(record_date)', 'diagnosis_id');
+            foreach ($diagIdsForUnserved as $did) {
+                $candidates = [
+                    (int) ($maxBlood[$did] ?? 0),
+                    (int) ($maxDiet[$did] ?? 0),
+                    (int) ($maxExercise[$did] ?? 0),
+                ];
+                $maxRecordByDiag[$did] = max($candidates);
+            }
         }
         $nowTs = time();
         foreach ($lists as &$item) {
-            $last = (int) ($maxBloodByDiag[(int) $item['id']] ?? 0);
+            $last = (int) ($maxRecordByDiag[(int) $item['id']] ?? 0);
             $item['last_blood_record_at'] = $last > 0 ? date('Y-m-d', $last) : null;
             $item['unserved_days'] = $last > 0 ? max(0, (int) floor(($nowTs - $last) / 86400)) : null;
         }
diff --git a/server/app/adminapi/logic/tcm/DiagnosisLogic.php b/server/app/adminapi/logic/tcm/DiagnosisLogic.php
index 5ddc0591..ef22ba1f 100644
--- a/server/app/adminapi/logic/tcm/DiagnosisLogic.php
+++ b/server/app/adminapi/logic/tcm/DiagnosisLogic.php
@@ -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,