Merge branch 'fix-diagnosis-20250505'

server/app/adminapi/lists/tcm/DiagnosisLists.php

@@ -17,6 +17,7 @@ namespace app\adminapi\lists\tcm;
 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\DiagnosisViewRecord;
 use app\common\model\doctor\Appointment;
 use app\common\model\tcm\Prescription;
@@ -381,6 +382,25 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         foreach ($lists as &$item) {
             $item['video_call_hint'] = $this->buildVideoCallHint($latestCallByDiag[$item['id']] ?? null);
         }
+        unset($item);
+
+        // 未服务天数：以血糖记录最近一条 record_date 为锚点（口径见 prd T3）
+        // 单次 GROUP BY 聚合，不会成 N+1；走 idx_diagnosis_id 索引。
+        $diagIdsForUnserved = array_values(array_filter(array_unique(array_column($lists, 'id'))));
+        $maxBloodByDiag = [];
+        if (!empty($diagIdsForUnserved)) {
+            $maxBloodByDiag = BloodRecord::whereIn('diagnosis_id', $diagIdsForUnserved)
+                ->whereNull('delete_time')
+                ->group('diagnosis_id')
+                ->column('MAX(record_date)', 'diagnosis_id');
+        }
+        $nowTs = time();
+        foreach ($lists as &$item) {
+            $last = (int) ($maxBloodByDiag[(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;
+        }
+        unset($item);
 
         return $lists;
     }

server/app/adminapi/lists/tcm/DiagnosisTodoLists.php

@@ -0,0 +1,73 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+declare(strict_types=1);
+
+namespace app\adminapi\lists\tcm;
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\logic\tcm\DiagnosisTodoLogic;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\tcm\DiagnosisTodo;
+
+/**
+ * 诊单待办事项列表
+ *
+ * 默认按 remind_time desc 排序；按 diagnosis_id 过滤。
+ *
+ * @package app\adminapi\lists\tcm
+ */
+class DiagnosisTodoLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['diagnosis_id', 'status', 'creator_id'],
+        ];
+    }
+
+    public function lists(): array
+    {
+        $lists = DiagnosisTodo::where($this->searchWhere)
+            ->field([
+                'id', 'diagnosis_id', 'patient_id', 'content', 'remind_time',
+                'status', 'creator_id', 'creator_name', 'notified_at', 'error',
+                'cancelled_at', 'cancelled_by', 'create_time', 'update_time',
+            ])
+            ->append([
+                'status_text',
+                'remind_time_text',
+                'notified_at_text',
+                'cancelled_at_text',
+            ])
+            ->order('remind_time', 'desc')
+            ->order('id', 'desc')
+            ->limit($this->limitOffset, $this->limitLength)
+            ->select()
+            ->toArray();
+
+        // 业务态：是否能被「我」取消（前端按钮显隐用）
+        $adminId = (int) $this->adminId;
+        foreach ($lists as &$item) {
+            $item['can_cancel'] = DiagnosisTodoLogic::canCancel($item, $adminId);
+        }
+
+        return $lists;
+    }
+
+    public function count(): int
+    {
+        return DiagnosisTodo::where($this->searchWhere)->count();
+    }
+}