Merge branch 'master' into cs

server/app/adminapi/controller/tcm/DiagnosisController.php

@@ -18,6 +18,7 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\tcm\DiagnosisLists;
 use app\adminapi\logic\order\OrderActionLogLogic;
 use app\adminapi\logic\tcm\DiagnosisLogic;
+use app\adminapi\logic\tcm\TrackingNoteLogic;
 use app\adminapi\validate\tcm\DiagnosisValidate;
 use app\common\model\Order;
 use app\common\model\WechatChatRecord;
@@ -113,12 +114,86 @@ class DiagnosisController extends BaseAdminController
      */
     public function detail()
     {
-        
+
         $params = (new DiagnosisValidate())->goCheck('id');
         $result = DiagnosisLogic::detail($params);
         return $this->data($result);
     }
 
+    /**
+     * @notes 二诊只读病例详情（患者信息 + 病例 + 跟踪记录）
+     *
+     * 路由：GET /tcm.diagnosis/readonlyDetail?id=:diagnosisId
+     * 权限：tcm.diagnosis/readonlyDetail
+     *
+     * @return \think\response\Json
+     */
+    public function readonlyDetail()
+    {
+        $params = (new DiagnosisValidate())->goCheck('readonlyDetail');
+        $result = DiagnosisLogic::readonlyDetail($params, $this->adminId, $this->adminInfo);
+        if (empty($result)) {
+            return $this->fail(DiagnosisLogic::getError() ?: '诊单不存在或无权访问');
+        }
+
+        return $this->data($result);
+    }
+
+    /**
+     * @notes 跟踪信息（血糖血压 / 饮食 / 运动）—— 按日期区间 lazy load
+     *
+     * 路由：GET /tcm.diagnosis/trackingWindow?id=:diagnosisId&start_date=&end_date=
+     * 权限：tcm.diagnosis/readonlyDetail（与只读病例页同档；接诊台亦复用）
+     *
+     * @return \think\response\Json
+     */
+    public function trackingWindow()
+    {
+        $params = (new DiagnosisValidate())->goCheck('trackingWindow');
+        $result = DiagnosisLogic::fetchTrackingWindow(
+            (int) $params['id'],
+            (string) ($params['start_date'] ?? ''),
+            (string) ($params['end_date'] ?? '')
+        );
+        return $this->data($result);
+    }
+
+    /**
+     * @notes 新增跟踪备注（按天合并追加，仅文字）
+     *
+     * 路由：POST /tcm.diagnosis/addTrackingNote
+     * 权限：tcm.diagnosis/addTrackingNote
+     *
+     * @return \think\response\Json
+     */
+    public function addTrackingNote()
+    {
+        $params = (new DiagnosisValidate())->post()->goCheck('addTrackingNote');
+        $ok = TrackingNoteLogic::addOrAppend([
+            'diagnosis_id' => (int) $params['diagnosis_id'],
+            'admin_id'     => (int) $this->adminId,
+            'content'      => (string) $params['tracking_content'],
+        ]);
+        if ($ok === false) {
+            return $this->fail(TrackingNoteLogic::getError() ?: '保存失败');
+        }
+        return $this->success('保存成功');
+    }
+
+    /**
+     * @notes 拉取跟踪备注列表（note_date DESC）
+     *
+     * 路由：GET /tcm.diagnosis/trackingNotes?diagnosis_id=:diagnosisId
+     * 权限：tcm.diagnosis/trackingNotes
+     *
+     * @return \think\response\Json
+     */
+    public function trackingNotes()
+    {
+        $params = (new DiagnosisValidate())->goCheck('trackingNotes');
+        return $this->data(TrackingNoteLogic::getByDiagnosis((int) $params['diagnosis_id']));
+    }
+
     /**
      * @notes 诊单挂号 / 取消挂号 操作日志（谁在何时操作）
      */

server/app/adminapi/controller/tcm/DiagnosisTodoController.php

@@ -0,0 +1,81 @@
+<?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\controller\tcm;
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\tcm\DiagnosisTodoLists;
+use app\adminapi\logic\tcm\DiagnosisTodoLogic;
+use app\adminapi\validate\tcm\DiagnosisTodoValidate;
+
+/**
+ * 诊单待办事项控制器
+ *
+ * 职责：仅 lists / add / cancel / detail；编辑能力故意不开放（要改 = 取消重建）
+ *
+ * @package app\adminapi\controller\tcm
+ */
+class DiagnosisTodoController extends BaseAdminController
+{
+    /**
+     * @notes 待办列表（按 diagnosis_id）
+     */
+    public function lists()
+    {
+        (new DiagnosisTodoValidate())->goCheck('list');
+
+        return $this->dataLists(new DiagnosisTodoLists());
+    }
+
+    /**
+     * @notes 新增待办
+     */
+    public function add()
+    {
+        $params = (new DiagnosisTodoValidate())->post()->goCheck('add');
+        $result = DiagnosisTodoLogic::add($params, $this->adminId, $this->adminInfo);
+        if (!$result) {
+            return $this->fail(DiagnosisTodoLogic::getError() ?: '创建失败');
+        }
+
+        return $this->success('创建成功', [], 1, 1);
+    }
+
+    /**
+     * @notes 取消待办（仅 status=0 可取消，仅创建人/超管）
+     */
+    public function cancel()
+    {
+        $params = (new DiagnosisTodoValidate())->post()->goCheck('cancel');
+        $result = DiagnosisTodoLogic::cancel((int) $params['id'], $this->adminId);
+        if (!$result) {
+            return $this->fail(DiagnosisTodoLogic::getError() ?: '取消失败');
+        }
+
+        return $this->success('已取消', [], 1, 1);
+    }
+
+    /**
+     * @notes 待办详情
+     */
+    public function detail()
+    {
+        $params = (new DiagnosisTodoValidate())->goCheck('detail');
+        $result = DiagnosisTodoLogic::detail((int) $params['id'], $this->adminId);
+
+        return $this->data($result);
+    }
+}